regenerate hive tests

author: Dimitry <winsvega@mail.ru> 2017-08-01 14:11:00 +0800
committer: Dimitry <winsvega@mail.ru> 2017-08-01 14:11:00 +0800
commit: f71c2688e1a839f8429f7e94ec5e56bb182d82cf (patch)
tree: e9ad8d0e49e5717880a5bef10c332711d047f5b3 /BlockchainTests/GeneralStateTests/stInitCodeTest
parent: 092c0560e8084a05516430b8ed3a735290c969e1 (diff)
download: dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.gz
dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.zst
dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.zip
19 files changed, 4920 insertions, 2540 deletions
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0.json
index ca8b76d85..b6d78b9d2 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallContractToCreateContractAndCallItOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x017878",
-                    "hash" : "c8fa668a95c3083192448f23ec7870124399b5b34443b57ea4c1bbfee4fac2b6",
-                    "mixHash" : "c2317a40b50ba9eac89380742d7be4cce1549e27b29d102a7034df63d6bbfcb0",
-                    "nonce" : "7298219ea33f9a3c",
+                    "hash" : "0x08a1e333fee285a4a922684b05613af6afa8374d69488468e94f16b789b8816f",
+                    "mixHash" : "0xa2a1fbf1739642bd924251f2e0efec67654e67abf61fc014ba334e6ee3f1ebe4",
+                    "nonce" : "0xabc6c5de1f8013ae",
                     "number" : "0x01",
-                    "parentHash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-                    "receiptTrie" : "7bb57f19482df999dca6a92266bf1c6afae186e631e28314f57fd532008f76aa",
-                    "stateRoot" : "b6e7008326531bc630be69df6c30c403e5492aa50a40fb28154d97a461431d0f",
+                    "parentHash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+                    "receiptTrie" : "0x7bb57f19482df999dca6a92266bf1c6afae186e631e28314f57fd532008f76aa",
+                    "stateRoot" : "0xb6e7008326531bc630be69df6c30c403e5492aa50a40fb28154d97a461431d0f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7008326531bc630be69df6c30c403e5492aa50a40fb28154d97a461431d0fa06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba07bb57f19482df999dca6a92266bf1c6afae186e631e28314f57fd532008f76aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830178788203e880a0c2317a40b50ba9eac89380742d7be4cce1549e27b29d102a7034df63d6bbfcb0887298219ea33f9a3cf862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
+                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7008326531bc630be69df6c30c403e5492aa50a40fb28154d97a461431d0fa06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba07bb57f19482df999dca6a92266bf1c6afae186e631e28314f57fd532008f76aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830178788203e880a0a2a1fbf1739642bd924251f2e0efec67654e67abf61fc014ba334e6ee3f1ebe488abc6c5de1f8013aef862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xd2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866f",
                         "s" : "0x3ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c8fa668a95c3083192448f23ec7870124399b5b34443b57ea4c1bbfee4fac2b6",
+        "lastblockhash" : "0x08a1e333fee285a4a922684b05613af6afa8374d69488468e94f16b789b8816f",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e7",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x01",
@@ -68,21 +73,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f57878",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f46888",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x00",
@@ -92,16 +97,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -109,27 +114,32 @@
         }
     },
     "CallContractToCreateContractAndCallItOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x017878",
-                    "hash" : "aacf801aaf47576ae3440e1fc00778c23e793c6df8bb8ccf513f459abf83605c",
-                    "mixHash" : "4fc74aa3c00a3fd786fae8c67ceef06de8b2c480f01ffda1e4de89ead88dc0c5",
-                    "nonce" : "dba1554b1b464082",
+                    "hash" : "0x59f68bfa9f03832d91067e7ba46b906d90d764e2576f8aaa5e082ec112274e57",
+                    "mixHash" : "0x539ec8ee0a155b8b6c74b0d0247d9bfda5b6880488a99f105e2a6f4bf6c0ab70",
+                    "nonce" : "0x81d5e6b5338fcec7",
                     "number" : "0x01",
-                    "parentHash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-                    "receiptTrie" : "a99851210afc9fcd1ecc1da8d023849a15c73bc095d04f09ca5ed488321b243e",
-                    "stateRoot" : "f4903fbf1186edb38b101bd7b7a539667d1d6c1ae67c7abd71cfd3d206a03f83",
+                    "parentHash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+                    "receiptTrie" : "0xa99851210afc9fcd1ecc1da8d023849a15c73bc095d04f09ca5ed488321b243e",
+                    "stateRoot" : "0xf4903fbf1186edb38b101bd7b7a539667d1d6c1ae67c7abd71cfd3d206a03f83",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4903fbf1186edb38b101bd7b7a539667d1d6c1ae67c7abd71cfd3d206a03f83a06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba0a99851210afc9fcd1ecc1da8d023849a15c73bc095d04f09ca5ed488321b243eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830178788203e880a04fc74aa3c00a3fd786fae8c67ceef06de8b2c480f01ffda1e4de89ead88dc0c588dba1554b1b464082f862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
+                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4903fbf1186edb38b101bd7b7a539667d1d6c1ae67c7abd71cfd3d206a03f83a06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba0a99851210afc9fcd1ecc1da8d023849a15c73bc095d04f09ca5ed488321b243eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830178788203e880a0539ec8ee0a155b8b6c74b0d0247d9bfda5b6880488a99f105e2a6f4bf6c0ab708881d5e6b5338fcec7f862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -138,7 +148,7 @@
                         "nonce" : "0x00",
                         "r" : "0xd2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866f",
                         "s" : "0x3ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -148,28 +158,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "aacf801aaf47576ae3440e1fc00778c23e793c6df8bb8ccf513f459abf83605c",
+        "lastblockhash" : "0x59f68bfa9f03832d91067e7ba46b906d90d764e2576f8aaa5e082ec112274e57",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e7",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x01",
@@ -177,21 +187,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f57878",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f46888",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x01",
@@ -201,16 +211,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -218,27 +228,32 @@
         }
     },
     "CallContractToCreateContractAndCallItOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01754e",
-                    "hash" : "feadc21f375b60a244f683d2d314e7171c02ff24af2c2313c0b90dbd7dc8b113",
-                    "mixHash" : "9488ceb73192d59f81a6d0796ede915d7b242225f5b5145db9a0a53f2751ae9b",
-                    "nonce" : "aca1c5b07177a6fc",
+                    "hash" : "0x6f2dce87f7f62e821fff8d775db8e8465be13210bd8455b604467a4801113f74",
+                    "mixHash" : "0xf4a401876b341e41ada51928355b67445bd37eec48c65d777c5a21e4b203c85a",
+                    "nonce" : "0xad97e79a8fd41e12",
                     "number" : "0x01",
-                    "parentHash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-                    "receiptTrie" : "8273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0d",
-                    "stateRoot" : "49fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022ab",
+                    "parentHash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+                    "receiptTrie" : "0x8273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0d",
+                    "stateRoot" : "0x49fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022ab",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022aba06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba08273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301754e8203e880a09488ceb73192d59f81a6d0796ede915d7b242225f5b5145db9a0a53f2751ae9b88aca1c5b07177a6fcf862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
+                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022aba06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba08273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301754e8203e880a0f4a401876b341e41ada51928355b67445bd37eec48c65d777c5a21e4b203c85a88ad97e79a8fd41e12f862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -247,7 +262,7 @@
                         "nonce" : "0x00",
                         "r" : "0xd2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866f",
                         "s" : "0x3ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -257,28 +272,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "feadc21f375b60a244f683d2d314e7171c02ff24af2c2313c0b90dbd7dc8b113",
+        "lastblockhash" : "0x6f2dce87f7f62e821fff8d775db8e8465be13210bd8455b604467a4801113f74",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e7",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x01",
@@ -286,21 +301,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5754e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f46bb2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x00",
@@ -310,16 +325,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -327,27 +342,32 @@
         }
     },
     "CallContractToCreateContractAndCallItOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01754e",
-                    "hash" : "f5f08c6e7500a9dced6bb1a22f7bee6faafc20f3bcd2bc3eb24d6bdb825c91c9",
-                    "mixHash" : "bd7557cb0cf661cc24f0a0c74cac8c01bd5ada8b9cdd26a6f81e65c0de36ffd8",
-                    "nonce" : "d09a7721dff6e530",
+                    "hash" : "0xdb3e4bcc4f7929ea54b7f0fb84d711f9e44fe9ea71eafa8a7476e5b6d917f736",
+                    "mixHash" : "0xccfb19c9b95258bb56891cc87ca69aa04d81e757965c0e74b9b070733f2d9bdf",
+                    "nonce" : "0x4447e62b9190819e",
                     "number" : "0x01",
-                    "parentHash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-                    "receiptTrie" : "8273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0d",
-                    "stateRoot" : "49fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022ab",
+                    "parentHash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+                    "receiptTrie" : "0x8273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0d",
+                    "stateRoot" : "0x49fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022ab",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022aba06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba08273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301754e8203e880a0bd7557cb0cf661cc24f0a0c74cac8c01bd5ada8b9cdd26a6f81e65c0de36ffd888d09a7721dff6e530f862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
+                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049fd5a656b743526cc86fda39b5f418717aa61be6d061fe4af67f55b1df022aba06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba08273cb7e49c6a8e6310343f78fd87d3593302e48ba97aca79feacac0ee22dd0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301754e8203e880a0ccfb19c9b95258bb56891cc87ca69aa04d81e757965c0e74b9b070733f2d9bdf884447e62b9190819ef862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -356,7 +376,7 @@
                         "nonce" : "0x00",
                         "r" : "0xd2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866f",
                         "s" : "0x3ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -366,28 +386,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f5f08c6e7500a9dced6bb1a22f7bee6faafc20f3bcd2bc3eb24d6bdb825c91c9",
+        "lastblockhash" : "0xdb3e4bcc4f7929ea54b7f0fb84d711f9e44fe9ea71eafa8a7476e5b6d917f736",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e7",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x01",
@@ -395,21 +415,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5754e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f46bb2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x00",
@@ -419,16 +439,137 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x03e8",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallContractToCreateContractAndCallItOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractAndCallItOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x017878",
+                    "hash" : "0x3123e33e0c047efe6765bf7be84f8db58606a83dff5ccfde750183a5b56d5efe",
+                    "mixHash" : "0x827a7a2c9eb320cb65423036775a62ca2fdf95388e0296f7481e65d07f44ec37",
+                    "nonce" : "0x419eb9a0f74964a1",
+                    "number" : "0x01",
+                    "parentHash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+                    "receiptTrie" : "0xd0e270562064e137d79f512ef3ca4c981a592b3d8607487df457dea9a774d027",
+                    "stateRoot" : "0x46b8c2b73e0ac95683298ef39dba8efab9c4560eb0d78a9f0322fa7cc5502213",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a08da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa046b8c2b73e0ac95683298ef39dba8efab9c4560eb0d78a9f0322fa7cc5502213a06f54a3f90a0be837cd8357c28b481ba8017d07ba63237e10b76569a2c6e2bd3ba0d0e270562064e137d79f512ef3ca4c981a592b3d8607487df457dea9a774d027b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830178788203e880a0827a7a2c9eb320cb65423036775a62ca2fdf95388e0296f7481e65d07f44ec3788419eb9a0f74964a1f862f8608001830318f894095e7baea6a6c7c4c2dfeb977efac326af552d8780001ba0d2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866fa03ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x0318f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2dcdfd1cdaddf6df344be51f59e214875efd3405d665d95d4dc8655293b866f",
+                        "s" : "0x3ec96b23e0612dd65f9b8d505e26b8b95fcb8612e207bd4ec1f613edb4f68ec0",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x8da1d28acef8b132ae719f0ca5ff9468e0dc911675aa8477dcefbfa8f02d2843",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ab4ce03e63eee91700ee708b140752dc1a2eac333f0ca7cbfe3b1d74737d6c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3123e33e0c047efe6765bf7be84f8db58606a83dff5ccfde750183a5b56d5efe",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x03e7",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f57878",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f46888",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x01",
+                "code" : "0x602060406000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0c"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546103e8f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0.json
index a751d5ba4..9d2e46f9c 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallContractToCreateContractNoCash_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe2ac",
-                    "hash" : "a0c9e3fb64505aefff906034be3cf54b4643186d49765c4ea8e3bbc9592ef145",
-                    "mixHash" : "4c321ed7c99a637b3712f18b78f271e21600dd4ce92c27c0bef40e04c674e38c",
-                    "nonce" : "078071c1d9a5d916",
+                    "hash" : "0x555beb82197da7f8a0da0959e2ac3ac2f070f66cf41dda6e20bf5da1daa6cac3",
+                    "mixHash" : "0x8b47c339ae46dd74c6c61c8c3908ff8914bff7efbfc20982dfdce01add267085",
+                    "nonce" : "0x5df4325ade9830a2",
                     "number" : "0x01",
-                    "parentHash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-                    "receiptTrie" : "9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
-                    "stateRoot" : "6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
+                    "parentHash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+                    "receiptTrie" : "0x9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
+                    "stateRoot" : "0x6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a04c321ed7c99a637b3712f18b78f271e21600dd4ce92c27c0bef40e04c674e38c88078071c1d9a5d916f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a08b47c339ae46dd74c6c61c8c3908ff8914bff7efbfc20982dfdce01add267085885df4325ade9830a2f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a0c9e3fb64505aefff906034be3cf54b4643186d49765c4ea8e3bbc9592ef145",
+        "lastblockhash" : "0x555beb82197da7f8a0da0959e2ac3ac2f070f66cf41dda6e20bf5da1daa6cac3",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4e2ac",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f4fe54",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,27 +105,32 @@
         }
     },
     "CallContractToCreateContractNoCash_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe2ac",
-                    "hash" : "96010b8b49a5916e0b034be8654216e25eab1c32b194c618a98128b153a7326b",
-                    "mixHash" : "12295bd3e25e482422752fc1b514535e889013618fa6cfa0c34c743ea5272973",
-                    "nonce" : "d24529523a505474",
+                    "hash" : "0x6e84c1bb014f43681aed46c98ed324ef169114672a3f04edf4352bf2542e318e",
+                    "mixHash" : "0x6c36920b752a56fbc3b91cdcf204608848964019f36ff0cbdb507fc4c2cc1790",
+                    "nonce" : "0xc2507a325f001c82",
                     "number" : "0x01",
-                    "parentHash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-                    "receiptTrie" : "9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
-                    "stateRoot" : "6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
+                    "parentHash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+                    "receiptTrie" : "0x9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
+                    "stateRoot" : "0x6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a012295bd3e25e482422752fc1b514535e889013618fa6cfa0c34c743ea527297388d24529523a505474f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a06c36920b752a56fbc3b91cdcf204608848964019f36ff0cbdb507fc4c2cc179088c2507a325f001c82f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -129,7 +139,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "96010b8b49a5916e0b034be8654216e25eab1c32b194c618a98128b153a7326b",
+        "lastblockhash" : "0x6e84c1bb014f43681aed46c98ed324ef169114672a3f04edf4352bf2542e318e",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4e2ac",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f4fe54",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,27 +210,32 @@
         }
     },
     "CallContractToCreateContractNoCash_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe2ac",
-                    "hash" : "ce9fb7a8b6be474195119c08aabdf27c312bba70d1314524755b597b7b7762e3",
-                    "mixHash" : "87ae076e572ac6279a6c336f1f2275bd3b983185d1b2de025dc784cc02903ac3",
-                    "nonce" : "c9f01b082bd6f58e",
+                    "hash" : "0x28ff693df855d71b6ccaf199cd5bd3978fb3eabeb1b1a056200c96ee5313e206",
+                    "mixHash" : "0xeb7b6aa23b92126fdb17c4887a2b1cf0e6b35f85b3f14880e2b24c0e6babab3d",
+                    "nonce" : "0xa88ea847fc76be29",
                     "number" : "0x01",
-                    "parentHash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-                    "receiptTrie" : "9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
-                    "stateRoot" : "6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
+                    "parentHash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+                    "receiptTrie" : "0x9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
+                    "stateRoot" : "0x6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a087ae076e572ac6279a6c336f1f2275bd3b983185d1b2de025dc784cc02903ac388c9f01b082bd6f58ef863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a0eb7b6aa23b92126fdb17c4887a2b1cf0e6b35f85b3f14880e2b24c0e6babab3d88a88ea847fc76be29f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -229,7 +244,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ce9fb7a8b6be474195119c08aabdf27c312bba70d1314524755b597b7b7762e3",
+        "lastblockhash" : "0x28ff693df855d71b6ccaf199cd5bd3978fb3eabeb1b1a056200c96ee5313e206",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4e2ac",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f4fe54",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,27 +315,32 @@
         }
     },
     "CallContractToCreateContractNoCash_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe2ac",
-                    "hash" : "96341db6db267c01d6887c53bc71645550d00b26c784f23a2568bf92c182a149",
-                    "mixHash" : "fee43a011581dc1c0774df33df873fbf49f6d969e435ce83c111176599b801cf",
-                    "nonce" : "6902060a1275362b",
+                    "hash" : "0x7d6938617d8325f3843cd7f99b8176d6d63dd70a8d64e03b200f11c45632a70b",
+                    "mixHash" : "0xdafd2e496d384321986e4b26fe0b3113d21401b4dae97e7c0801f573176f907b",
+                    "nonce" : "0xa9faf7bf62129d44",
                     "number" : "0x01",
-                    "parentHash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-                    "receiptTrie" : "9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
-                    "stateRoot" : "6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
+                    "parentHash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+                    "receiptTrie" : "0x9c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4",
+                    "stateRoot" : "0x6ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a0fee43a011581dc1c0774df33df873fbf49f6d969e435ce83c111176599b801cf886902060a1275362bf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ce3d68bac2a89bb8c5ec663f0605a87a6d86d1b28c817a5a456d8afd9ddc99ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09c189254a2bde6f29e978f6cb6a4c75dfdd5ec21071a1be944f0ec42077e25e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a0dafd2e496d384321986e4b26fe0b3113d21401b4dae97e7c0801f573176f907b88a9faf7bf62129d44f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -329,7 +349,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "96341db6db267c01d6887c53bc71645550d00b26c784f23a2568bf92c182a149",
+        "lastblockhash" : "0x7d6938617d8325f3843cd7f99b8176d6d63dd70a8d64e03b200f11c45632a70b",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x2710",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4e2ac",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f4fe54",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x2710",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallContractToCreateContractNoCash_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractNoCash_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe2ac",
+                    "hash" : "0xb30cce1271e393bd6d0e94c3a499a89b156639415bf0b8c3f255811b02a57980",
+                    "mixHash" : "0x971c1484a3dc1a15db77670175352d9e5e9ceb40a1583cefd8e2efbaa187fca2",
+                    "nonce" : "0x1d550196642ee335",
+                    "number" : "0x01",
+                    "parentHash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+                    "receiptTrie" : "0xc8bc98f9a7d4124d67e2833a6112bcafdaccadb314a6663e2eb48b495499f59f",
+                    "stateRoot" : "0xceef91fb9b87f61a38dc08bd8713b7d00236bb070932cd329ac308a9e4fd277a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f8a0bc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ceef91fb9b87f61a38dc08bd8713b7d00236bb070932cd329ac308a9e4fd277aa0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0c8bc98f9a7d4124d67e2833a6112bcafdaccadb314a6663e2eb48b495499f59fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e2ac8203e880a0971c1484a3dc1a15db77670175352d9e5e9ceb40a1583cefd8e2efbaa187fca2881d550196642ee335f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x01312d00",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
+                        "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xbc06bf689d79c7b72fd952f319fd5f95ea6b84a71b5560c3f06cd5a3c5cc5659",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0971b6b9053c66f3283e93f3fda3df98ef152022d76a0881c1aa29c1261ab372aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb30cce1271e393bd6d0e94c3a499a89b156639415bf0b8c3f255811b02a57980",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4e2ac",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f4fe54",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x2710",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b620186a0f0600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0.json
index b71274e58..89468b077 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallContractToCreateContractOOGBonusGas_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0197b8",
-                    "hash" : "43f27def265cdef8025e245af1b984cc58c4c80bf8e10fed172a8db2c83d710e",
-                    "mixHash" : "98657f78a7cad131d2bb39d3c7f5c467b332607f08221b6f059e5d5f74670368",
-                    "nonce" : "41a9517f314501bb",
+                    "hash" : "0x4a4e88585f94704429b3e9207eeece7e6d8117f6c3a8cbd265e6df18ce497c4d",
+                    "mixHash" : "0xf81992a96f05ec8ad36912323d2809f67f327c789773f9bce4c30819a20770cd",
+                    "nonce" : "0xd5792d6e869fd0b5",
                     "number" : "0x01",
-                    "parentHash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-                    "receiptTrie" : "25ceea645a32bf95fa108bd48a32b011fb8fa61ab9c04d9dfc28f2d2fbe59989",
-                    "stateRoot" : "4ece2e21765cd3000485bc35b44022e8a850364a85816d7fbecc202fca99645e",
+                    "parentHash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+                    "receiptTrie" : "0x25ceea645a32bf95fa108bd48a32b011fb8fa61ab9c04d9dfc28f2d2fbe59989",
+                    "stateRoot" : "0x4ece2e21765cd3000485bc35b44022e8a850364a85816d7fbecc202fca99645e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ece2e21765cd3000485bc35b44022e8a850364a85816d7fbecc202fca99645ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba025ceea645a32bf95fa108bd48a32b011fb8fa61ab9c04d9dfc28f2d2fbe59989b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830197b88203e880a098657f78a7cad131d2bb39d3c7f5c467b332607f08221b6f059e5d5f746703688841a9517f314501bbf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ece2e21765cd3000485bc35b44022e8a850364a85816d7fbecc202fca99645ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba025ceea645a32bf95fa108bd48a32b011fb8fa61ab9c04d9dfc28f2d2fbe59989b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830197b88203e880a0f81992a96f05ec8ad36912323d2809f67f327c789773f9bce4c30819a20770cd88d5792d6e869fd0b5f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "43f27def265cdef8025e245af1b984cc58c4c80bf8e10fed172a8db2c83d710e",
+        "lastblockhash" : "0x4a4e88585f94704429b3e9207eeece7e6d8117f6c3a8cbd265e6df18ce497c4d",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6f",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x01",
@@ -68,21 +73,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f597b8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f44948",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x00",
@@ -92,16 +97,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x70",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -109,27 +114,32 @@
         }
     },
     "CallContractToCreateContractOOGBonusGas_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0197b8",
-                    "hash" : "00fb44c245a9ad718ba5a055dd3d62688f1e03db4698c3647094f8dbf6c303b4",
-                    "mixHash" : "0160962bd3bfbd0345a02578826eb430ef7d0c6e4410ad12c274fef3aa12bd12",
-                    "nonce" : "f3d6ef7948154c17",
+                    "hash" : "0x4417c21d2139c44212167aea3f9165c763f724b7202fa92886c8669702e80ad3",
+                    "mixHash" : "0x34df241beff5e4d46f488fd9f53cd58035094f22edb0544e1955858fc65f2af3",
+                    "nonce" : "0x108b36a4c165f6d5",
                     "number" : "0x01",
-                    "parentHash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-                    "receiptTrie" : "e2c99ec3a3de672e345a055da98f9c37edadf91f60e48c9d306e6a41bbef1c91",
-                    "stateRoot" : "925fe9574ac1f4366e9574da110cb8f73170d47b72afafdf8dabb1110de56202",
+                    "parentHash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+                    "receiptTrie" : "0xe2c99ec3a3de672e345a055da98f9c37edadf91f60e48c9d306e6a41bbef1c91",
+                    "stateRoot" : "0x925fe9574ac1f4366e9574da110cb8f73170d47b72afafdf8dabb1110de56202",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0925fe9574ac1f4366e9574da110cb8f73170d47b72afafdf8dabb1110de56202a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0e2c99ec3a3de672e345a055da98f9c37edadf91f60e48c9d306e6a41bbef1c91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830197b88203e880a00160962bd3bfbd0345a02578826eb430ef7d0c6e4410ad12c274fef3aa12bd1288f3d6ef7948154c17f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0925fe9574ac1f4366e9574da110cb8f73170d47b72afafdf8dabb1110de56202a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0e2c99ec3a3de672e345a055da98f9c37edadf91f60e48c9d306e6a41bbef1c91b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830197b88203e880a034df241beff5e4d46f488fd9f53cd58035094f22edb0544e1955858fc65f2af388108b36a4c165f6d5f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -138,7 +148,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -148,28 +158,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "00fb44c245a9ad718ba5a055dd3d62688f1e03db4698c3647094f8dbf6c303b4",
+        "lastblockhash" : "0x4417c21d2139c44212167aea3f9165c763f724b7202fa92886c8669702e80ad3",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6f",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x01",
@@ -177,21 +187,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f597b8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f44948",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x01",
@@ -201,16 +211,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x70",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -218,27 +228,32 @@
         }
     },
     "CallContractToCreateContractOOGBonusGas_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01948e",
-                    "hash" : "8dd39c8e48f9aa89967c3944dd9ffee90a405091cff127e7de63a38b8b142fc9",
-                    "mixHash" : "2359a1c0aef05a6761d3a06a7401e0a6df5654492429788f28e4a532b3974d83",
-                    "nonce" : "75282ba9388876b0",
+                    "hash" : "0xe0854d92b45922868d34f15ac41eb749fa05eb08a49389f08b5544f27feaf1c7",
+                    "mixHash" : "0x23c30514610203c4dca28efc4a2278d9c4f931c80003e3f83c9c0349dd7a63a0",
+                    "nonce" : "0x262413953e095285",
                     "number" : "0x01",
-                    "parentHash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-                    "receiptTrie" : "8131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3",
-                    "stateRoot" : "ed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1",
+                    "parentHash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+                    "receiptTrie" : "0x8131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3",
+                    "stateRoot" : "0xed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba08131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301948e8203e880a02359a1c0aef05a6761d3a06a7401e0a6df5654492429788f28e4a532b3974d838875282ba9388876b0f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba08131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301948e8203e880a023c30514610203c4dca28efc4a2278d9c4f931c80003e3f83c9c0349dd7a63a088262413953e095285f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -247,7 +262,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -257,28 +272,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8dd39c8e48f9aa89967c3944dd9ffee90a405091cff127e7de63a38b8b142fc9",
+        "lastblockhash" : "0xe0854d92b45922868d34f15ac41eb749fa05eb08a49389f08b5544f27feaf1c7",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6f",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x01",
@@ -286,21 +301,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5948e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f44c72",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x00",
@@ -310,16 +325,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x70",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -327,27 +342,32 @@
         }
     },
     "CallContractToCreateContractOOGBonusGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01948e",
-                    "hash" : "026bba543b10fa552ee209d1370d8120d4fb222d92708cda45344d26e299dcd3",
-                    "mixHash" : "1e393f7706484fc63666ab4a41a86af2061d7152156d196e3a2dde86cb6122fb",
-                    "nonce" : "ee5a67c0f67c9485",
+                    "hash" : "0x73c178d8a4d36f2b45c7548b7a95d7ec33f5e4b2997be88d45ca8f12f17b1b4e",
+                    "mixHash" : "0x37d9c4476d74f00cb7413240a2b15c33ec9d94f7b43b2643b5accae44a8fcb23",
+                    "nonce" : "0xe9525408d9983c1e",
                     "number" : "0x01",
-                    "parentHash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-                    "receiptTrie" : "8131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3",
-                    "stateRoot" : "ed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1",
+                    "parentHash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+                    "receiptTrie" : "0x8131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3",
+                    "stateRoot" : "0xed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba08131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301948e8203e880a01e393f7706484fc63666ab4a41a86af2061d7152156d196e3a2dde86cb6122fb88ee5a67c0f67c9485f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed144c0e977342bfe4a31ceb416aaa79f91da25672d099c4bab16b82a3067bd1a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba08131e3247190f47b49c209c0648641774a99cc274548cd156f694a8dffef27e3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301948e8203e880a037d9c4476d74f00cb7413240a2b15c33ec9d94f7b43b2643b5accae44a8fcb2388e9525408d9983c1ef863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -356,7 +376,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -366,28 +386,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "026bba543b10fa552ee209d1370d8120d4fb222d92708cda45344d26e299dcd3",
+        "lastblockhash" : "0x73c178d8a4d36f2b45c7548b7a95d7ec33f5e4b2997be88d45ca8f12f17b1b4e",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x6f",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x01",
@@ -395,21 +415,21 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5948e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f44c72",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x01",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x00",
@@ -419,16 +439,137 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x70",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallContractToCreateContractOOGBonusGas_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOGBonusGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x0197b8",
+                    "hash" : "0x2d4f4dba8a11a3e326dad80eb9448e698141854c27ebdd0597e9d46a4358a2d9",
+                    "mixHash" : "0x33c00e325f2db98d91fb44686d0c289448c84399aeb1606f3cfef82871aafb0f",
+                    "nonce" : "0x4a1a081b7c778ed4",
+                    "number" : "0x01",
+                    "parentHash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+                    "receiptTrie" : "0xafb912caf146373afd94860bf417361b0ea3846588fa08fc4488171da2d16ad7",
+                    "stateRoot" : "0x6cf5a55b36dab9c7fa470556b6196265587a7d12caaca9f1f116ee264e77e414",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0e95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cf5a55b36dab9c7fa470556b6196265587a7d12caaca9f1f116ee264e77e414a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0afb912caf146373afd94860bf417361b0ea3846588fa08fc4488171da2d16ad7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830197b88203e880a033c00e325f2db98d91fb44686d0c289448c84399aeb1606f3cfef82871aafb0f884a1a081b7c778ed4f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x01312d00",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
+                        "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe95f241512fdfa30db5ba27319016442c1f488fc821101e347bb6b4c9d465a48",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09008ad91ec1e082d860c3b91e8a401467937d726d71eb253f563ca256c64e393a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2d4f4dba8a11a3e326dad80eb9448e698141854c27ebdd0597e9d46a4358a2d9",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x6f",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f597b8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f44948",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x01",
+                "code" : "0x602060406000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0c"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x70",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600c6000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0.json
index 7e00e24ea..da141237a 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallContractToCreateContractOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0147ed",
-                    "hash" : "970b0416af51f99b595f26bdda29293e92b820a25ccf0bd36116816bdb2d2167",
-                    "mixHash" : "a56c1727418006e3c885b7d6d70f3756e2c8d8ae7017219eab6310854a20eb7f",
-                    "nonce" : "1bbd2f6cef312d90",
+                    "hash" : "0xeac189b435c39e4182f3e8190299c061470a0837d0f0501ba7893564f5af99ab",
+                    "mixHash" : "0x8ba5519767fba8809f96ebabd2c5838a0376e8dfdbee775dcf5267df8c6b62dd",
+                    "nonce" : "0x0726352b7c89aecd",
                     "number" : "0x01",
-                    "parentHash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-                    "receiptTrie" : "76f285c48fe1779b274581bbb5aa7779e480184c06d7d13083efa8bea0317efa",
-                    "stateRoot" : "aec3bb1dae7f86447c7fbe1a0060f17124fe6a1c2e5a7731bd344f303a8a3589",
+                    "parentHash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+                    "receiptTrie" : "0x76f285c48fe1779b274581bbb5aa7779e480184c06d7d13083efa8bea0317efa",
+                    "stateRoot" : "0xaec3bb1dae7f86447c7fbe1a0060f17124fe6a1c2e5a7731bd344f303a8a3589",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aec3bb1dae7f86447c7fbe1a0060f17124fe6a1c2e5a7731bd344f303a8a3589a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba076f285c48fe1779b274581bbb5aa7779e480184c06d7d13083efa8bea0317efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830147ed8203e880a0a56c1727418006e3c885b7d6d70f3756e2c8d8ae7017219eab6310854a20eb7f881bbd2f6cef312d90f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aec3bb1dae7f86447c7fbe1a0060f17124fe6a1c2e5a7731bd344f303a8a3589a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba076f285c48fe1779b274581bbb5aa7779e480184c06d7d13083efa8bea0317efab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830147ed8203e880a08ba5519767fba8809f96ebabd2c5838a0376e8dfdbee775dcf5267df8c6b62dd880726352b7c89aecdf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,67 +44,67 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "970b0416af51f99b595f26bdda29293e92b820a25ccf0bd36116816bdb2d2167",
+        "lastblockhash" : "0xeac189b435c39e4182f3e8190299c061470a0837d0f0501ba7893564f5af99ab",
         "network" : "EIP150",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f547ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f49913",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -107,27 +112,32 @@
         }
     },
     "CallContractToCreateContractOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xe645",
-                    "hash" : "0c10cdc9260427b8c08188464ceac42d981c3bb751cb0a01613b907c8449f477",
-                    "mixHash" : "6fb6620ba21437c50e807ad6c426b3bc9bcb469ac3eb96750b2f12fe2571562d",
-                    "nonce" : "e40c0b8ea0a830ac",
+                    "hash" : "0xdad95b7ed5c6da1258a44e4df2cede47ba6889113b50fb59ae80d313c613ee89",
+                    "mixHash" : "0x0cc8734911aabbae30f42a7cc0d5fdec2e7037788b16fb4cadd72d0eb151b139",
+                    "nonce" : "0x7c1f7f5c1cf29513",
                     "number" : "0x01",
-                    "parentHash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-                    "receiptTrie" : "50ed407e8fb8f1496563359b68033684f541649f606904c802ee0fa7179c8e2a",
-                    "stateRoot" : "880794e34db723856d914ac7a4807ffe25fed7f1052cd41d987c4f40cf03f35f",
+                    "parentHash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+                    "receiptTrie" : "0x50ed407e8fb8f1496563359b68033684f541649f606904c802ee0fa7179c8e2a",
+                    "stateRoot" : "0x880794e34db723856d914ac7a4807ffe25fed7f1052cd41d987c4f40cf03f35f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880794e34db723856d914ac7a4807ffe25fed7f1052cd41d987c4f40cf03f35fa0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba050ed407e8fb8f1496563359b68033684f541649f606904c802ee0fa7179c8e2ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e6458203e880a06fb6620ba21437c50e807ad6c426b3bc9bcb469ac3eb96750b2f12fe2571562d88e40c0b8ea0a830acf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90261f901f8a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880794e34db723856d914ac7a4807ffe25fed7f1052cd41d987c4f40cf03f35fa0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba050ed407e8fb8f1496563359b68033684f541649f606904c802ee0fa7179c8e2ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e6458203e880a00cc8734911aabbae30f42a7cc0d5fdec2e7037788b16fb4cadd72d0eb151b139887c1f7f5c1cf29513f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -136,7 +146,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -146,60 +156,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0c10cdc9260427b8c08188464ceac42d981c3bb751cb0a01613b907c8449f477",
+        "lastblockhash" : "0xdad95b7ed5c6da1258a44e4df2cede47ba6889113b50fb59ae80d313c613ee89",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4e645",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f4fabb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -207,27 +217,32 @@
         }
     },
     "CallContractToCreateContractOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0144c3",
-                    "hash" : "6665f308cd1fb04cd7a53ca5196bee645bce13da986dabd203c92bc6ddff64ce",
-                    "mixHash" : "b9cc1709d4665e67a781842d26df7e225a6f5da1b6b0634feb63ba55af13f36c",
-                    "nonce" : "f662a4eb35880ffb",
+                    "hash" : "0x2eda344649518a84ddc5df810977852b2dbfd08b5963a53a9018a6771303921e",
+                    "mixHash" : "0xdea54c3167193b96005c7aa9cd648c40949357ba1a447cb9f898d35adf638980",
+                    "nonce" : "0x9fd5c606a13556df",
                     "number" : "0x01",
-                    "parentHash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-                    "receiptTrie" : "1f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689",
-                    "stateRoot" : "133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915e",
+                    "parentHash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+                    "receiptTrie" : "0x1f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689",
+                    "stateRoot" : "0x133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba01f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830144c38203e880a0b9cc1709d4665e67a781842d26df7e225a6f5da1b6b0634feb63ba55af13f36c88f662a4eb35880ffbf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba01f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830144c38203e880a0dea54c3167193b96005c7aa9cd648c40949357ba1a447cb9f898d35adf638980889fd5c606a13556dff863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -236,7 +251,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -246,67 +261,67 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6665f308cd1fb04cd7a53ca5196bee645bce13da986dabd203c92bc6ddff64ce",
+        "lastblockhash" : "0x2eda344649518a84ddc5df810977852b2dbfd08b5963a53a9018a6771303921e",
         "network" : "Frontier",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f544c3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f49c3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -314,27 +329,32 @@
         }
     },
     "CallContractToCreateContractOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0144c3",
-                    "hash" : "8adb08d1fa8427139a1d0f092e04091d131ad1055adf0bffb4369405b797a3e0",
-                    "mixHash" : "268894613ee0b86989df195a120a616be0cdf111d22cb7913d9720eb36c045ae",
-                    "nonce" : "823efe41757fa588",
+                    "hash" : "0xa1129ecc944fbeb14426e138bea4c169420a986585a24fc58564f96853fed63e",
+                    "mixHash" : "0x020b067e8388d61b277f27e7ce7c45e111507c20aabfec973017eb2085401c48",
+                    "nonce" : "0x1ccb7faa11fbed26",
                     "number" : "0x01",
-                    "parentHash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-                    "receiptTrie" : "1f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689",
-                    "stateRoot" : "133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915e",
+                    "parentHash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+                    "receiptTrie" : "0x1f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689",
+                    "stateRoot" : "0x133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba01f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830144c38203e880a0268894613ee0b86989df195a120a616be0cdf111d22cb7913d9720eb36c045ae88823efe41757fa588f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133def848b7488f02be36c3581427f749e14cbcdd037d3eb21956ff0588a915ea0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba01f29606e3936712cf9938824531816915c27d2adae8ccaf0239b1d02630e5689b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830144c38203e880a0020b067e8388d61b277f27e7ce7c45e111507c20aabfec973017eb2085401c48881ccb7faa11fbed26f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -343,7 +363,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -353,67 +373,179 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8adb08d1fa8427139a1d0f092e04091d131ad1055adf0bffb4369405b797a3e0",
+        "lastblockhash" : "0xa1129ecc944fbeb14426e138bea4c169420a986585a24fc58564f96853fed63e",
         "network" : "Homestead",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f544c3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f49c3d",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x00",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallContractToCreateContractOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xe645",
+                    "hash" : "0x67fdeb11ee985c7d82b4fa508498e33c258f712a6efbb1e57d780e36eadaa533",
+                    "mixHash" : "0xa0f40ece3cc4f65e45cf93952d75051fc31dfe6a5d219b3de458035e04a60ca7",
+                    "nonce" : "0x195bb65e323b231c",
+                    "number" : "0x01",
+                    "parentHash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+                    "receiptTrie" : "0x7534433b50186c9f0b9e1356076a9f61b0ae0fafec6996818b0f8b9be9766dd7",
+                    "stateRoot" : "0x4c00597874513212f859d5c4de85fe33cfc6c8dad1d57c06043517f6e3d54bd1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f8a0a534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c00597874513212f859d5c4de85fe33cfc6c8dad1d57c06043517f6e3d54bd1a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba07534433b50186c9f0b9e1356076a9f61b0ae0fafec6996818b0f8b9be9766dd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082e6458203e880a0a0f40ece3cc4f65e45cf93952d75051fc31dfe6a5d219b3de458035e04a60ca788195bb65e323b231cf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x01312d00",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
+                        "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa534019fa2efaf02cb07a6c1cc61aae2de13918981e90c09af384f3547746fff",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d647f5bfa0b3a4b82c37851493672cbc6b2b204c7c0bb8661be6cbebf9b4338a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67fdeb11ee985c7d82b4fa508498e33c258f712a6efbb1e57d780e36eadaa533",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x00",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4e645",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f4fabb",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f0600055600060006000600060006000546000f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0.json
index 4f7833dd6..19bc9f2da 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x020bce",
-                    "hash" : "73286ec09bc5d27c2571e9d45ba2e5d2ff9fdc93bdf1f7b03d7cde340d5b9247",
-                    "mixHash" : "617d9f8b642e57b3d07c2c0e6be6577348950c5e449fc514f7413a45fc5bf44e",
-                    "nonce" : "d064bfca1f30ad5a",
+                    "hash" : "0x1a607348d59207086bf8b59cf0f01f5bf26aa8c863a6b08265b9df3573f72ea5",
+                    "mixHash" : "0xfc44bbbc1ede3676f035909d042093136d8fe076c63f75b133207e8eee9647d9",
+                    "nonce" : "0x1732dc56e710cd87",
                     "number" : "0x01",
-                    "parentHash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-                    "receiptTrie" : "0be265330da891375705e26e04cff2057cf8da71eda9ea32e1a00604c2e14bfc",
-                    "stateRoot" : "2dfb554be016af87899a790e7f68df54e0bf5a845a7b2e536438be46c8eea3c6",
+                    "parentHash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+                    "receiptTrie" : "0x0be265330da891375705e26e04cff2057cf8da71eda9ea32e1a00604c2e14bfc",
+                    "stateRoot" : "0x2dfb554be016af87899a790e7f68df54e0bf5a845a7b2e536438be46c8eea3c6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dfb554be016af87899a790e7f68df54e0bf5a845a7b2e536438be46c8eea3c6a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba00be265330da891375705e26e04cff2057cf8da71eda9ea32e1a00604c2e14bfcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083020bce8203e880a0617d9f8b642e57b3d07c2c0e6be6577348950c5e449fc514f7413a45fc5bf44e88d064bfca1f30ad5af863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02dfb554be016af87899a790e7f68df54e0bf5a845a7b2e536438be46c8eea3c6a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba00be265330da891375705e26e04cff2057cf8da71eda9ea32e1a00604c2e14bfcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083020bce8203e880a0fc44bbbc1ede3676f035909d042093136d8fe076c63f75b133207e8eee9647d9881732dc56e710cd87f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "73286ec09bc5d27c2571e9d45ba2e5d2ff9fdc93bdf1f7b03d7cde340d5b9247",
+        "lastblockhash" : "0x1a607348d59207086bf8b59cf0f01f5bf26aa8c863a6b08265b9df3573f72ea5",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e6",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x01",
@@ -68,28 +73,28 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60bce",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "0x62c01474f089b07dae603491675dc5b5748f7049" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f3d532",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x02",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x01",
@@ -99,16 +104,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,27 +121,32 @@
         }
     },
     "CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x020bce",
-                    "hash" : "7276024407a979126984ff3bdb6e8a69fbc6b55bca19e6625bb95b94d3d33812",
-                    "mixHash" : "45eeb06aa1415bb00fb9b27a16cc5ab72d96c3f07444ae9b82e92db6def4e93e",
-                    "nonce" : "25e781d6e2faa243",
+                    "hash" : "0xb829c5ff67d22b22549f63a97c231d810e826bc393f750c0a7aab9ecaa593b88",
+                    "mixHash" : "0x38c5610f7773b27264ff74c7c4ed3a1fa4abca1f51ab8b9b4b972b431908110f",
+                    "nonce" : "0x8f68740e94c37bc2",
                     "number" : "0x01",
-                    "parentHash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-                    "receiptTrie" : "b32bf75e7ba424e11408eadb8df7219ca7b6702ec3688e3df458ad3b7af1db41",
-                    "stateRoot" : "5f59be6c17ae2dc3e5835658f7458daf2d2df6b8fc2a97872057984634cd573a",
+                    "parentHash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+                    "receiptTrie" : "0xb32bf75e7ba424e11408eadb8df7219ca7b6702ec3688e3df458ad3b7af1db41",
+                    "stateRoot" : "0x5f59be6c17ae2dc3e5835658f7458daf2d2df6b8fc2a97872057984634cd573a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f59be6c17ae2dc3e5835658f7458daf2d2df6b8fc2a97872057984634cd573aa0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0b32bf75e7ba424e11408eadb8df7219ca7b6702ec3688e3df458ad3b7af1db41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083020bce8203e880a045eeb06aa1415bb00fb9b27a16cc5ab72d96c3f07444ae9b82e92db6def4e93e8825e781d6e2faa243f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f59be6c17ae2dc3e5835658f7458daf2d2df6b8fc2a97872057984634cd573aa0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0b32bf75e7ba424e11408eadb8df7219ca7b6702ec3688e3df458ad3b7af1db41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083020bce8203e880a038c5610f7773b27264ff74c7c4ed3a1fa4abca1f51ab8b9b4b972b431908110f888f68740e94c37bc2f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -145,7 +155,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7276024407a979126984ff3bdb6e8a69fbc6b55bca19e6625bb95b94d3d33812",
+        "lastblockhash" : "0xb829c5ff67d22b22549f63a97c231d810e826bc393f750c0a7aab9ecaa593b88",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e6",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x01",
@@ -184,28 +194,28 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60bce",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "91ed00a0a906270d466af043c4e111dadca970a3" : {
+            "0x91ed00a0a906270d466af043c4e111dadca970a3" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f3d532",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x02",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x02",
@@ -215,16 +225,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,27 +242,32 @@
         }
     },
     "CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0208a4",
-                    "hash" : "75813ce6b31163c78f608c48bc4aeccd777d331af6fb8f32d3d524bed44a7160",
-                    "mixHash" : "d92bcb63306377d12d36eb2b87bcd4ed548ca7dc32af97ce837124dc9495de08",
-                    "nonce" : "b378ab062fcce647",
+                    "hash" : "0xca3930544e002bf2624333ddc7de131dcc85f6be7c651d2a1a912ce80d910088",
+                    "mixHash" : "0x78c2003add32febf6069464e0cdbc8f034bb465df4073ce971b54334ced8385e",
+                    "nonce" : "0xdc7507d543f7add4",
                     "number" : "0x01",
-                    "parentHash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-                    "receiptTrie" : "9587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3e",
-                    "stateRoot" : "2166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233b",
+                    "parentHash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+                    "receiptTrie" : "0x9587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3e",
+                    "stateRoot" : "0x2166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233ba0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830208a48203e880a0d92bcb63306377d12d36eb2b87bcd4ed548ca7dc32af97ce837124dc9495de0888b378ab062fcce647f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233ba0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830208a48203e880a078c2003add32febf6069464e0cdbc8f034bb465df4073ce971b54334ced8385e88dc7507d543f7add4f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -261,7 +276,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -271,28 +286,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "75813ce6b31163c78f608c48bc4aeccd777d331af6fb8f32d3d524bed44a7160",
+        "lastblockhash" : "0xca3930544e002bf2624333ddc7de131dcc85f6be7c651d2a1a912ce80d910088",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e6",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x01",
@@ -300,28 +315,28 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f608a4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "0x62c01474f089b07dae603491675dc5b5748f7049" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f3d85c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x02",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x01",
@@ -331,16 +346,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -348,27 +363,32 @@
         }
     },
     "CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0208a4",
-                    "hash" : "8db2e00d5ef1364570ea8ee6c58650c9fb25cdf228ef98e703ff1fe95cd60c6a",
-                    "mixHash" : "9318a135f4b5bb494d98c4e39f26e83486e1c82a5e52fa41e46a07b7a831d435",
-                    "nonce" : "acadc315aa7b85ea",
+                    "hash" : "0xcb4b9839ebb9cee07759d17cca91740fc8e6ef36f5c26ac5d66c579d984c7f91",
+                    "mixHash" : "0x337279229176cf5c4689d849653fdffde06bfb0c9ee9d48ce835db4e2ba3a733",
+                    "nonce" : "0xc9b7badb3b146610",
                     "number" : "0x01",
-                    "parentHash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-                    "receiptTrie" : "9587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3e",
-                    "stateRoot" : "2166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233b",
+                    "parentHash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+                    "receiptTrie" : "0x9587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3e",
+                    "stateRoot" : "0x2166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233ba0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830208a48203e880a09318a135f4b5bb494d98c4e39f26e83486e1c82a5e52fa41e46a07b7a831d43588acadc315aa7b85eaf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02166eb5a22a97399caab706f1173266eaa9cd70fc65897c7c4c535d42a6f233ba0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba09587f9741314b1dee1074730759bcdce59eb91fbe56ed7c84cf01823da7f3e3eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830208a48203e880a0337279229176cf5c4689d849653fdffde06bfb0c9ee9d48ce835db4e2ba3a73388c9b7badb3b146610f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -377,7 +397,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -387,28 +407,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8db2e00d5ef1364570ea8ee6c58650c9fb25cdf228ef98e703ff1fe95cd60c6a",
+        "lastblockhash" : "0xcb4b9839ebb9cee07759d17cca91740fc8e6ef36f5c26ac5d66c579d984c7f91",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e6",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x01",
@@ -416,28 +436,28 @@
                     "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f608a4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "0x62c01474f089b07dae603491675dc5b5748f7049" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f3d85c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x02",
                 "code" : "0x602060406000f0",
                 "nonce" : "0x01",
@@ -447,16 +467,144 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x03e8",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x020bce",
+                    "hash" : "0xf167092f63ead6cb34e4e839383158653f14a054d2ae0698548ba5e66fe5e933",
+                    "mixHash" : "0x807a7dcbb10981198ec8ec6026ddfd3b4360c796546c6aa77ee721d64a6b57d1",
+                    "nonce" : "0xc184824e9231c4fe",
+                    "number" : "0x01",
+                    "parentHash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+                    "receiptTrie" : "0x3a3cd2c38cdc3856b319587656aae613a536feb4defa9287b3119e8e423c1cde",
+                    "stateRoot" : "0x43acf46e6f3c2f71afd6e184ab0acd41c0797a10e64d18132ea66d7b29e845f9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a0e5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043acf46e6f3c2f71afd6e184ab0acd41c0797a10e64d18132ea66d7b29e845f9a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba03a3cd2c38cdc3856b319587656aae613a536feb4defa9287b3119e8e423c1cdeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083020bce8203e880a0807a7dcbb10981198ec8ec6026ddfd3b4360c796546c6aa77ee721d64a6b57d188c184824e9231c4fef863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x01312d00",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
+                        "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xe5fd83f124dcd71457791f68888663cd4fc5d517ca06ff19db29a5d8757ab3dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07023225daeb6280eebc6aca862a89da3fa43e86fe4bcd206775c960bb5c4b739a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf167092f63ead6cb34e4e839383158653f14a054d2ae0698548ba5e66fe5e933",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x03e6",
+                "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60bce",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x91ed00a0a906270d466af043c4e111dadca970a3" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f3d532",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x02",
+                "code" : "0x602060406000f0",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x00" : "0x0c"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x03e8",
                 "code" : "0x74600c60005566602060406000f060205260076039f36000526015600b6001f06000556000600060006000600160005461c350f1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0.json
index 09a7140ff..e4fe92c44 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x019a59",
-                    "hash" : "d9ffcf7fa09511b0081bd98549d5e66233358ddf16ded21941cd13f5e437c68b",
-                    "mixHash" : "a9e0c291962d17fbd4b1364cda1b5d16bcada653e4d44dc6d25fd82033a9c280",
-                    "nonce" : "478d37adb682493f",
+                    "hash" : "0xed590e8511558dbf9e215796dbf653868377cfe516fd0e6088b283bdd7e06662",
+                    "mixHash" : "0x7781699f8b4574157465e0cdca693c5f9cc6558c6067f87e651f0b16859a88aa",
+                    "nonce" : "0x4299cac66600a73c",
                     "number" : "0x01",
-                    "parentHash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-                    "receiptTrie" : "5f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11",
-                    "stateRoot" : "b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0",
+                    "parentHash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+                    "receiptTrie" : "0x5f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11",
+                    "stateRoot" : "0xb60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba05f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a0a9e0c291962d17fbd4b1364cda1b5d16bcada653e4d44dc6d25fd82033a9c28088478d37adb682493ff863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba05f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a07781699f8b4574157465e0cdca693c5f9cc6558c6067f87e651f0b16859a88aa884299cac66600a73cf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -39,58 +44,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d9ffcf7fa09511b0081bd98549d5e66233358ddf16ded21941cd13f5e437c68b",
+        "lastblockhash" : "0xed590e8511558dbf9e215796dbf653868377cfe516fd0e6088b283bdd7e06662",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f59a59",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "0x62c01474f089b07dae603491675dc5b5748f7049" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f446a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x0c"
@@ -98,16 +103,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -115,27 +120,32 @@
         }
     },
     "CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x019a59",
-                    "hash" : "a8a0d75b419a40f52a173a128d8cfe3d2bcd54ab0443906779dbb1cbdf6dba3a",
-                    "mixHash" : "8d5d4bdbeae932abc1d085d5e92f7f838565fef90df1e8993cf7be34aecf9608",
-                    "nonce" : "97693772d49f1d8b",
+                    "hash" : "0xe9d07708e488036814e2ab36cefaec4d264b5a9b8030cfcae0fbbaa44ad24c09",
+                    "mixHash" : "0xdb06bb9f5a237d084cea4799b0a6a7e61b8625ffcce4ebaed4584700d148214a",
+                    "nonce" : "0x22a31f503958d20e",
                     "number" : "0x01",
-                    "parentHash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-                    "receiptTrie" : "dfceca6bcd529664c09bb2746c1785d0481dcd762e52584a94634356da575235",
-                    "stateRoot" : "9dfeb7c301188388b96fcd89afa692fa1cefef688924bf31ea5ddea52535bcad",
+                    "parentHash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+                    "receiptTrie" : "0xdfceca6bcd529664c09bb2746c1785d0481dcd762e52584a94634356da575235",
+                    "stateRoot" : "0x9dfeb7c301188388b96fcd89afa692fa1cefef688924bf31ea5ddea52535bcad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dfeb7c301188388b96fcd89afa692fa1cefef688924bf31ea5ddea52535bcada0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0dfceca6bcd529664c09bb2746c1785d0481dcd762e52584a94634356da575235b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a08d5d4bdbeae932abc1d085d5e92f7f838565fef90df1e8993cf7be34aecf96088897693772d49f1d8bf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dfeb7c301188388b96fcd89afa692fa1cefef688924bf31ea5ddea52535bcada0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba0dfceca6bcd529664c09bb2746c1785d0481dcd762e52584a94634356da575235b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a0db06bb9f5a237d084cea4799b0a6a7e61b8625ffcce4ebaed4584700d148214a8822a31f503958d20ef863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -144,7 +154,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -154,58 +164,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a8a0d75b419a40f52a173a128d8cfe3d2bcd54ab0443906779dbb1cbdf6dba3a",
+        "lastblockhash" : "0xe9d07708e488036814e2ab36cefaec4d264b5a9b8030cfcae0fbbaa44ad24c09",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f59a59",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "91ed00a0a906270d466af043c4e111dadca970a3" : {
+            "0x91ed00a0a906270d466af043c4e111dadca970a3" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f446a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x00" : "0x0c"
@@ -213,16 +223,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -230,27 +240,32 @@
         }
     },
     "CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x019a59",
-                    "hash" : "8a8a4c7c7d41ddd4bc5f35c5af1e009c2c3045b633c3b26abab1f1c9685ca1ad",
-                    "mixHash" : "69395a91f16fa4ac352fbda37dd8076139002bae8709c88a73382cc0679d3e89",
-                    "nonce" : "b1f028073351e6e8",
+                    "hash" : "0xf219aba7089cb9a484139d6179a0683abfa4474213fc3eb526f5b53c56cbde14",
+                    "mixHash" : "0xd5f65fed305bbe41b1aaad9cd70b734c6ece84b7482f6c86274aafc5d636bfe2",
+                    "nonce" : "0xc4381155b6060af6",
                     "number" : "0x01",
-                    "parentHash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-                    "receiptTrie" : "5f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11",
-                    "stateRoot" : "b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0",
+                    "parentHash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+                    "receiptTrie" : "0x5f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11",
+                    "stateRoot" : "0xb60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba05f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a069395a91f16fa4ac352fbda37dd8076139002bae8709c88a73382cc0679d3e8988b1f028073351e6e8f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba05f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a0d5f65fed305bbe41b1aaad9cd70b734c6ece84b7482f6c86274aafc5d636bfe288c4381155b6060af6f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -259,7 +274,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -269,58 +284,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8a8a4c7c7d41ddd4bc5f35c5af1e009c2c3045b633c3b26abab1f1c9685ca1ad",
+        "lastblockhash" : "0xf219aba7089cb9a484139d6179a0683abfa4474213fc3eb526f5b53c56cbde14",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f59a59",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "0x62c01474f089b07dae603491675dc5b5748f7049" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f446a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x0c"
@@ -328,16 +343,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -345,27 +360,32 @@
         }
     },
     "CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x019a59",
-                    "hash" : "2e75ac2c80dd30e5229ed7b91d06477b1226343a160fbdaa661636bae4a8c2d9",
-                    "mixHash" : "566cd403956c7b42ed7e21c121d7c1508643b7135e731f03bf3a40f28735d27c",
-                    "nonce" : "60d09bf9c37a91ab",
+                    "hash" : "0xf824b3cc50ffe925a77ae12876f3e9ad4287b2a5300fa9c05d206fc859152496",
+                    "mixHash" : "0x7ac13b49e5490a93de8ef4c0597cbb639113a6d4d245cc6f61a8a0cea0ecb6dc",
+                    "nonce" : "0x1e1996899a50769c",
                     "number" : "0x01",
-                    "parentHash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-                    "receiptTrie" : "5f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11",
-                    "stateRoot" : "b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0",
+                    "parentHash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+                    "receiptTrie" : "0x5f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11",
+                    "stateRoot" : "0xb60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba05f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a0566cd403956c7b42ed7e21c121d7c1508643b7135e731f03bf3a40f28735d27c8860d09bf9c37a91abf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b60e6a3a4ce88a386ed8fa11774b7f5a84c07a5a0987be55fde9762779dcdba0a0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba05f494bdeb23575fa3bd40e22b1dce8e00821a65ca3e26f0cf41993a076fd8e11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a07ac13b49e5490a93de8ef4c0597cbb639113a6d4d245cc6f61a8a0cea0ecb6dc881e1996899a50769cf863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -374,7 +394,7 @@
                         "nonce" : "0x00",
                         "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
                         "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -384,58 +404,58 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2e75ac2c80dd30e5229ed7b91d06477b1226343a160fbdaa661636bae4a8c2d9",
+        "lastblockhash" : "0xf824b3cc50ffe925a77ae12876f3e9ad4287b2a5300fa9c05d206fc859152496",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f59a59",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "62c01474f089b07dae603491675dc5b5748f7049" : {
+            "0x62c01474f089b07dae603491675dc5b5748f7049" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f446a7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x0c"
@@ -443,16 +463,143 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01",
+                "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x019a59",
+                    "hash" : "0x90466f67204062fe7f5f49a2847c75085b9deeaeff229ee9a1b4b0d286ea559b",
+                    "mixHash" : "0x606890f0ae66f68d1657059d23a5ebabf4f0d127aedef860c446b33082a48c84",
+                    "nonce" : "0x62683d45d5f9d8e3",
+                    "number" : "0x01",
+                    "parentHash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+                    "receiptTrie" : "0x4249ede4a9bb75b6a35d88faa33ab29dd75fc937fdfbd8e07402076caa42000e",
+                    "stateRoot" : "0x69c5b446f43c763358434d2d70408bb2fe4a8f70c49899c93c9559b1652eb35f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f9a01cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069c5b446f43c763358434d2d70408bb2fe4a8f70c49899c93c9559b1652eb35fa0c9736bc50603440b31ff3f23c73baaab17b407a5db2b2aea4ea53a58a970ee0ba04249ede4a9bb75b6a35d88faa33ab29dd75fc937fdfbd8e07402076caa42000eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019a598203e880a0606890f0ae66f68d1657059d23a5ebabf4f0d127aedef860c446b33082a48c848862683d45d5f9d8e3f863f86180018401312d0094095e7baea6a6c7c4c2dfeb977efac326af552d8780001ca0a5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700a079cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabfc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x01312d00",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5babdfe77e19c1014d3aa0b7f949c3b47c9beb0beaadd25f81f121f7852d700",
+                        "s" : "0x79cdf46c2587c800f8d808ab682546ae36b37d05dfa55e3f8c9d36859386dabf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x1cb4c84ef681af532667f4acca241e0d3769d4927288569154066d0905e2cf46",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0814e0966dbab9be1081894a4a46f6b2d3ccf1c8beef627bdf9171ceb1f895797a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x90466f67204062fe7f5f49a2847c75085b9deeaeff229ee9a1b4b0d286ea559b",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01",
+                "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f59a59",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x91ed00a0a906270d466af043c4e111dadca970a3" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f446a7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x00" : "0x0c"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x6b600c600055602060406000f0600052600c60146000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x05f5e100",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallRecursiveContract_d0g0v0.json
index 86eef7fc0..3f9398635 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallRecursiveContract_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallRecursiveContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallRecursiveContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05d602",
-                    "hash" : "b38f68764c5d0dbde17d40d225d985e59f9406b1ab9e7a589d1d6200bff21b0c",
-                    "mixHash" : "3d435e037e350895372411187542249fed1d896152ac083c00a2a71cdeb7bfbe",
-                    "nonce" : "31070421674f0d2d",
+                    "hash" : "0x42a4c1f12b968183bd1a6e4262d550c7ab223e5c625b5b7cf657ef79f2fe1c9c",
+                    "mixHash" : "0xbb9a0ce69b98fe3babea8e9fc146b776a2fef6d89a0a577467b85ac4d0a4ed37",
+                    "nonce" : "0xee09e83ca57e5e68",
                     "number" : "0x01",
-                    "parentHash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-                    "receiptTrie" : "094fb672162ff0a137b3e30810321528a5a6cc10634df85054e4856fee261a17",
-                    "stateRoot" : "0289aea08a0161f13694a60100228ab183174df65a4dbe5c95b1193b8aa4a292",
+                    "parentHash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+                    "receiptTrie" : "0x094fb672162ff0a137b3e30810321528a5a6cc10634df85054e4856fee261a17",
+                    "stateRoot" : "0x0289aea08a0161f13694a60100228ab183174df65a4dbe5c95b1193b8aa4a292",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xd4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00289aea08a0161f13694a60100228ab183174df65a4dbe5c95b1193b8aa4a292a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0094fb672162ff0a137b3e30810321528a5a6cc10634df85054e4856fee261a17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008305d6028203e880a03d435e037e350895372411187542249fed1d896152ac083c00a2a71cdeb7bfbe8831070421674f0d2df862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
+                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00289aea08a0161f13694a60100228ab183174df65a4dbe5c95b1193b8aa4a292a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0094fb672162ff0a137b3e30810321528a5a6cc10634df85054e4856fee261a17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008305d6028203e880a0bb9a0ce69b98fe3babea8e9fc146b776a2fef6d89a0a577467b85ac4d0a4ed3788ee09e83ca57e5e68f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0x767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072d",
                         "s" : "0x6d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0ca",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x01"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b38f68764c5d0dbde17d40d225d985e59f9406b1ab9e7a589d1d6200bff21b0c",
+        "lastblockhash" : "0x42a4c1f12b968183bd1a6e4262d550c7ab223e5c625b5b7cf657ef79f2fe1c9c",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x29",
@@ -68,55 +73,55 @@
                     "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
                 }
             },
-            "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
+            "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f9d602",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
+            "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x096c3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "bbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
+            "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3"
                 }
             },
-            "dfceaa082d190ab34e3c37943de35ae8fc01f300" : {
+            "0xdfceaa082d190ab34e3c37943de35ae8fc01f300" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xdfceaa082d190ab34e3c37943de35ae8fc01f300"
                 }
             },
-            "f0064be0919341a45680ec0d592eaee47df671ac" : {
+            "0xf0064be0919341a45680ec0d592eaee47df671ac" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
@@ -124,16 +129,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x28",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -141,27 +146,32 @@
         }
     },
     "CallRecursiveContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallRecursiveContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05d602",
-                    "hash" : "51004f8594e2a4194c6c9312462f65a8f8cc2e25d8f7d3584359d2d56d3d20b4",
-                    "mixHash" : "a8a921597465d47c83c50ba11b1a6d553e42caeefbaa61226610254cf949f63b",
-                    "nonce" : "82e9e8737b46ae04",
+                    "hash" : "0xe1e2b7136ff84a6ca44ffd038ddbe9cd06e1facc36b799357916f73c6db2899a",
+                    "mixHash" : "0x769b813fb11b191851b94484c8e6eeab7249f6b2753c4c2b702ce72acb212edc",
+                    "nonce" : "0x9535eba4b8faf398",
                     "number" : "0x01",
-                    "parentHash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-                    "receiptTrie" : "f09f9453977e0f663e221d4f499c3a69374a3e9114d96a24e5a5f43a66fdf8bf",
-                    "stateRoot" : "40d37713bc5484e4042bebda7f367f88d1b7888e16428b359b4c57a2e42aa69d",
+                    "parentHash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+                    "receiptTrie" : "0xf09f9453977e0f663e221d4f499c3a69374a3e9114d96a24e5a5f43a66fdf8bf",
+                    "stateRoot" : "0x40d37713bc5484e4042bebda7f367f88d1b7888e16428b359b4c57a2e42aa69d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xd4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d37713bc5484e4042bebda7f367f88d1b7888e16428b359b4c57a2e42aa69da0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0f09f9453977e0f663e221d4f499c3a69374a3e9114d96a24e5a5f43a66fdf8bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008305d6028203e880a0a8a921597465d47c83c50ba11b1a6d553e42caeefbaa61226610254cf949f63b8882e9e8737b46ae04f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
+                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d37713bc5484e4042bebda7f367f88d1b7888e16428b359b4c57a2e42aa69da0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0f09f9453977e0f663e221d4f499c3a69374a3e9114d96a24e5a5f43a66fdf8bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008305d6028203e880a0769b813fb11b191851b94484c8e6eeab7249f6b2753c4c2b702ce72acb212edc889535eba4b8faf398f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -170,7 +180,7 @@
                         "nonce" : "0x00",
                         "r" : "0x767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072d",
                         "s" : "0x6d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0ca",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x01"
                     }
@@ -180,28 +190,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "51004f8594e2a4194c6c9312462f65a8f8cc2e25d8f7d3584359d2d56d3d20b4",
+        "lastblockhash" : "0xe1e2b7136ff84a6ca44ffd038ddbe9cd06e1facc36b799357916f73c6db2899a",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x29",
@@ -209,55 +219,55 @@
                     "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f9d602",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "4b0b4b3c7fd3dd5cea1d04dcf027dea29f84acb1" : {
+            "0x4b0b4b3c7fd3dd5cea1d04dcf027dea29f84acb1" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x02" : "0x4b0b4b3c7fd3dd5cea1d04dcf027dea29f84acb1"
                 }
             },
-            "60f971aa65f7e520dcb750823e2c239e61c3736b" : {
+            "0x60f971aa65f7e520dcb750823e2c239e61c3736b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x02" : "0x60f971aa65f7e520dcb750823e2c239e61c3736b"
                 }
             },
-            "6fc9df08d2206eff4f4c378aeb2a1f8c570952b9" : {
+            "0x6fc9df08d2206eff4f4c378aeb2a1f8c570952b9" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x02" : "0x6fc9df08d2206eff4f4c378aeb2a1f8c570952b9"
                 }
             },
-            "74a77e95f3228f0b4d116d5a12e09aaf99ce54ae" : {
+            "0x74a77e95f3228f0b4d116d5a12e09aaf99ce54ae" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x02" : "0x74a77e95f3228f0b4d116d5a12e09aaf99ce54ae"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x096c3d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "f0064be0919341a45680ec0d592eaee47df671ac" : {
+            "0xf0064be0919341a45680ec0d592eaee47df671ac" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
@@ -265,16 +275,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x28",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -282,27 +292,32 @@
         }
     },
     "CallRecursiveContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallRecursiveContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x061a80",
-                    "hash" : "e595c98cfe9f615686e468d400f6ea2b9f2c6afeb7a91a2e8959203cb2996362",
-                    "mixHash" : "e5905aceb6affc35c77dd1af0dcaa92371e1925fa559dfcd4fae16a4dee7ee87",
-                    "nonce" : "ab32b62031078283",
+                    "hash" : "0x567421afd395934c2b1442aef0bc99377975edee7be880d77aa90f4cc702ced0",
+                    "mixHash" : "0xdd03c365e7e208905974ffdf83a06cd204452765540148fe6c7a00e6d717ea89",
+                    "nonce" : "0x40a918b68b7741c0",
                     "number" : "0x01",
-                    "parentHash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-                    "receiptTrie" : "148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6",
-                    "stateRoot" : "55f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83",
+                    "parentHash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+                    "receiptTrie" : "0x148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6",
+                    "stateRoot" : "0x55f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xd4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083061a808203e880a0e5905aceb6affc35c77dd1af0dcaa92371e1925fa559dfcd4fae16a4dee7ee8788ab32b62031078283f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
+                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083061a808203e880a0dd03c365e7e208905974ffdf83a06cd204452765540148fe6c7a00e6d717ea898840a918b68b7741c0f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -311,7 +326,7 @@
                         "nonce" : "0x00",
                         "r" : "0x767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072d",
                         "s" : "0x6d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0ca",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x01"
                     }
@@ -321,28 +336,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e595c98cfe9f615686e468d400f6ea2b9f2c6afeb7a91a2e8959203cb2996362",
+        "lastblockhash" : "0x567421afd395934c2b1442aef0bc99377975edee7be880d77aa90f4cc702ced0",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x29",
@@ -350,63 +365,63 @@
                     "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
                 }
             },
-            "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
+            "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fa1a80",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
+            "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686"
                 }
             },
-            "9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
+            "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0927bf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "bbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
+            "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3"
                 }
             },
-            "dfceaa082d190ab34e3c37943de35ae8fc01f300" : {
+            "0xdfceaa082d190ab34e3c37943de35ae8fc01f300" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xdfceaa082d190ab34e3c37943de35ae8fc01f300"
                 }
             },
-            "f0064be0919341a45680ec0d592eaee47df671ac" : {
+            "0xf0064be0919341a45680ec0d592eaee47df671ac" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
@@ -414,16 +429,16 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x28",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -431,27 +446,32 @@
         }
     },
     "CallRecursiveContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallRecursiveContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x061a80",
-                    "hash" : "8aac263e9695988cb74a82bca17b7df5ba95b90e5b13d0c2a4c68d6a0c9a0f5f",
-                    "mixHash" : "f07464cc4aa3306b23613502c9e23361e4e6bae2799fc6d02a8d10d6d10f712e",
-                    "nonce" : "12fd39f920455744",
+                    "hash" : "0x0c70a49244d6ebd52e387086043afd6c8440b84d60efc328b74277a843fbcb0d",
+                    "mixHash" : "0x868993f232b5a49abb2ba65b96309b7c6b386fdab53c9ee5bd076b1b7b8f41e0",
+                    "nonce" : "0xbefc1ef62b5bd828",
                     "number" : "0x01",
-                    "parentHash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-                    "receiptTrie" : "148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6",
-                    "stateRoot" : "55f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83",
+                    "parentHash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+                    "receiptTrie" : "0x148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6",
+                    "stateRoot" : "0x55f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xd4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083061a808203e880a0f07464cc4aa3306b23613502c9e23361e4e6bae2799fc6d02a8d10d6d10f712e8812fd39f920455744f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
+                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055f734e7ea6efcad82a24fa8642ca33400d5d51513ab41b99f6e195ded745b83a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a0148ccddbf11792db5ae8678da605f39100dd3a61ccb30746f764c0da5f07fab6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083061a808203e880a0868993f232b5a49abb2ba65b96309b7c6b386fdab53c9ee5bd076b1b7b8f41e088befc1ef62b5bd828f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -460,7 +480,7 @@
                         "nonce" : "0x00",
                         "r" : "0x767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072d",
                         "s" : "0x6d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0ca",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x01"
                     }
@@ -470,28 +490,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8aac263e9695988cb74a82bca17b7df5ba95b90e5b13d0c2a4c68d6a0c9a0f5f",
+        "lastblockhash" : "0x0c70a49244d6ebd52e387086043afd6c8440b84d60efc328b74277a843fbcb0d",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x29",
@@ -499,63 +519,63 @@
                     "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
                 }
             },
-            "1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
+            "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x1a4c83e1a9834cdc7e4a905ff7f0cf44aed73180"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fa1a80",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
+            "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x8e3411c91d5dd4081b4846fa2f93808f5ad19686"
                 }
             },
-            "9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
+            "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x9ca74ad1a326b79d9ec9c080deb56062e975a7ee"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0927bf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "bbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
+            "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xbbba3a14689a28fd82f09d4e01bc87d9654e95c3"
                 }
             },
-            "dfceaa082d190ab34e3c37943de35ae8fc01f300" : {
+            "0xdfceaa082d190ab34e3c37943de35ae8fc01f300" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xdfceaa082d190ab34e3c37943de35ae8fc01f300"
                 }
             },
-            "f0064be0919341a45680ec0d592eaee47df671ac" : {
+            "0xf0064be0919341a45680ec0d592eaee47df671ac" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
@@ -563,16 +583,169 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x00",
+                "code" : "0x3060025560206000600039602060006000f0",
+                "nonce" : "0x28",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRecursiveContract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallRecursiveContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x05d602",
+                    "hash" : "0xdbb5d667ecf1df2028486c2e1aceca35751b1a0474589ba87ddf5d83c675ef55",
+                    "mixHash" : "0x41e475ee4a40270ca89c90e135deaa9ca2a7bc36830ea9b3dfd58402277c3ee6",
+                    "nonce" : "0x9d4546fa328ea3a6",
+                    "number" : "0x01",
+                    "parentHash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+                    "receiptTrie" : "0x29cd73fe1868f13a298f87d55ffc3c35f6c1251f98fd58835f99a95c718fbd31",
+                    "stateRoot" : "0xbd8dda70b05cd7849d17b2e6aacf77746c86678f9070414fea0383339ba94328",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a06c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd8dda70b05cd7849d17b2e6aacf77746c86678f9070414fea0383339ba94328a0d4be89a2f61318fc9713ec59a5f4dc08476e084155c765e911baf3180b66a493a029cd73fe1868f13a298f87d55ffc3c35f6c1251f98fd58835f99a95c718fbd31b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008305d6028203e880a041e475ee4a40270ca89c90e135deaa9ca2a7bc36830ea9b3dfd58402277c3ee6889d4546fa328ea3a6f862f860800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ca0767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072da06d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0cac0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x767b4aeef3b7b464066b6622894304ddbe828ff6f7d35b4a208479b84190072d",
+                        "s" : "0x6d23402c4c7144e986f0a9dbbb8bfc7fd8e1d75f13bb85d5cce03b46f0a8b0ca",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x6c44ba6d50081eedac235864ef83628b46a1a93f57c34e03e4782e7a04e3bf3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c33b65c5ead10d16ec24c6d6dcdff561dae7610857513f507152c6d05e15d22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdbb5d667ecf1df2028486c2e1aceca35751b1a0474589ba87ddf5d83c675ef55",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01",
+                "code" : "0x3060025560206000600039602060006000f0",
+                "nonce" : "0x29",
+                "storage" : {
+                    "0x02" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f9d602",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x4b0b4b3c7fd3dd5cea1d04dcf027dea29f84acb1" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x02" : "0x4b0b4b3c7fd3dd5cea1d04dcf027dea29f84acb1"
+                }
+            },
+            "0x60f971aa65f7e520dcb750823e2c239e61c3736b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x02" : "0x60f971aa65f7e520dcb750823e2c239e61c3736b"
+                }
+            },
+            "0x6fc9df08d2206eff4f4c378aeb2a1f8c570952b9" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x02" : "0x6fc9df08d2206eff4f4c378aeb2a1f8c570952b9"
+                }
+            },
+            "0x74a77e95f3228f0b4d116d5a12e09aaf99ce54ae" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x02" : "0x74a77e95f3228f0b4d116d5a12e09aaf99ce54ae"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x096c3d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xf0064be0919341a45680ec0d592eaee47df671ac" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x02" : "0xf0064be0919341a45680ec0d592eaee47df671ac"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x3060025560206000600039602060006000f0",
                 "nonce" : "0x28",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0.json
index a64d3d31e..bbfb02e6a 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "CallTheContractToCreateEmptyContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf18",
-                    "hash" : "af3e885d2c429d030357c3e1b88ab82ee6c678f0d64d473d611a7313a13246cb",
-                    "mixHash" : "2239426c9d90c6df9f4a57b94bd71fccc281375a0d3b6f2820779e88719aa895",
-                    "nonce" : "e387a55c2a471867",
+                    "hash" : "0xb108a768beb2f46048971ba118a9fa306eddea94b1dc60e77e9b82671df566e6",
+                    "mixHash" : "0x65f4a720f1de5a28c6d5e9b5e8eaf67319151dd011f181fb4cdb3a9dd502337a",
+                    "nonce" : "0xcb26721c0616a836",
                     "number" : "0x01",
-                    "parentHash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-                    "receiptTrie" : "2cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2",
-                    "stateRoot" : "90a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64",
+                    "parentHash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+                    "receiptTrie" : "0x2cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2",
+                    "stateRoot" : "0x90a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba02cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a02239426c9d90c6df9f4a57b94bd71fccc281375a0d3b6f2820779e88719aa89588e387a55c2a471867f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
+                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba02cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a065f4a720f1de5a28c6d5e9b5e8eaf67319151dd011f181fb4cdb3a9dd502337a88cb26721c0616a836f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -29,7 +34,7 @@
                         "nonce" : "0x00",
                         "r" : "0x39083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5",
                         "s" : "0x12cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4f",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -39,67 +44,67 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "af3e885d2c429d030357c3e1b88ab82ee6c678f0d64d473d611a7313a13246cb",
+        "lastblockhash" : "0xb108a768beb2f46048971ba118a9fa306eddea94b1dc60e77e9b82671df566e6",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4cf18",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e7327",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -107,27 +112,32 @@
         }
     },
     "CallTheContractToCreateEmptyContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf18",
-                    "hash" : "23a8b7c39aadfd161d1d3e7a02b8ad844ce9a1e4b92e1acc3bc244b0dc0218e7",
-                    "mixHash" : "a2a7e68422538dbbd16a5226b63acc911277bc9dbf25139bf7fee96180889a0d",
-                    "nonce" : "abd030cab22258bc",
+                    "hash" : "0x96d03d88b44bfefd95ddc41278957c57b94bc92820abb5b2a34ed19b26bbc9a1",
+                    "mixHash" : "0xf4c1ca45f04456035d950ed72add88da86231341f740fa745a0342296d2d655f",
+                    "nonce" : "0x3cb7a45fdef8bbe2",
                     "number" : "0x01",
-                    "parentHash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-                    "receiptTrie" : "7ad7d1d03f6d8a702bb3c949a36e907185e450fe574c566cfb7408fb5063b305",
-                    "stateRoot" : "a61af2032da7badc715f9ed9910726d0646ec5a7f872dc9b164be406c015e434",
+                    "parentHash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+                    "receiptTrie" : "0x7ad7d1d03f6d8a702bb3c949a36e907185e450fe574c566cfb7408fb5063b305",
+                    "stateRoot" : "0xa61af2032da7badc715f9ed9910726d0646ec5a7f872dc9b164be406c015e434",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a61af2032da7badc715f9ed9910726d0646ec5a7f872dc9b164be406c015e434a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba07ad7d1d03f6d8a702bb3c949a36e907185e450fe574c566cfb7408fb5063b305b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a0a2a7e68422538dbbd16a5226b63acc911277bc9dbf25139bf7fee96180889a0d88abd030cab22258bcf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
+                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a61af2032da7badc715f9ed9910726d0646ec5a7f872dc9b164be406c015e434a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba07ad7d1d03f6d8a702bb3c949a36e907185e450fe574c566cfb7408fb5063b305b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a0f4c1ca45f04456035d950ed72add88da86231341f740fa745a0342296d2d655f883cb7a45fdef8bbe2f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -136,7 +146,7 @@
                         "nonce" : "0x00",
                         "r" : "0x39083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5",
                         "s" : "0x12cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4f",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -146,67 +156,67 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "23a8b7c39aadfd161d1d3e7a02b8ad844ce9a1e4b92e1acc3bc244b0dc0218e7",
+        "lastblockhash" : "0x96d03d88b44bfefd95ddc41278957c57b94bc92820abb5b2a34ed19b26bbc9a1",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4cf18",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e7327",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -214,27 +224,32 @@
         }
     },
     "CallTheContractToCreateEmptyContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf18",
-                    "hash" : "5088bddbda2419d111151c101e468726dd78fdeedd4aa2d7d244467a02707ae7",
-                    "mixHash" : "0cc966fa5d4140f1899e38d9be25c9c98bf361671526fa84078d3b1587d12a57",
-                    "nonce" : "9ff5ddd55914f227",
+                    "hash" : "0xba7c88e005991a02d1d7ea3208e68c45ca804c96f3aabae0a38b445f72f85f1b",
+                    "mixHash" : "0x8a7f63f7bb7a2efcfdf3e4e12d598247fa59476af1efc69a6f7383b2c62ecfa2",
+                    "nonce" : "0x1c75983d4b936231",
                     "number" : "0x01",
-                    "parentHash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-                    "receiptTrie" : "2cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2",
-                    "stateRoot" : "90a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64",
+                    "parentHash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+                    "receiptTrie" : "0x2cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2",
+                    "stateRoot" : "0x90a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba02cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a00cc966fa5d4140f1899e38d9be25c9c98bf361671526fa84078d3b1587d12a57889ff5ddd55914f227f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
+                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba02cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a08a7f63f7bb7a2efcfdf3e4e12d598247fa59476af1efc69a6f7383b2c62ecfa2881c75983d4b936231f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -243,7 +258,7 @@
                         "nonce" : "0x00",
                         "r" : "0x39083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5",
                         "s" : "0x12cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4f",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -253,67 +268,67 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5088bddbda2419d111151c101e468726dd78fdeedd4aa2d7d244467a02707ae7",
+        "lastblockhash" : "0xba7c88e005991a02d1d7ea3208e68c45ca804c96f3aabae0a38b445f72f85f1b",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4cf18",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e7327",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -321,27 +336,32 @@
         }
     },
     "CallTheContractToCreateEmptyContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf18",
-                    "hash" : "c8c08229471dceba721e9961f38f0a381c2450270fe2eae9cf7393afe2d0b679",
-                    "mixHash" : "ce97c31c843432fe09bc1ace378228da0a24f669409438859ac218fa55248071",
-                    "nonce" : "8ec4f911b6b41dc9",
+                    "hash" : "0x969f6f188abc204ef11d9bdfa01d64cb5fdfe284e58ceec97c8efd1792e8b64a",
+                    "mixHash" : "0x39fec25fc565bc9d3d55f261170ea8a3fcc191dd8fe600815d4419c2e3701532",
+                    "nonce" : "0xfa8457e665b51b4a",
                     "number" : "0x01",
-                    "parentHash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-                    "receiptTrie" : "2cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2",
-                    "stateRoot" : "90a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64",
+                    "parentHash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+                    "receiptTrie" : "0x2cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2",
+                    "stateRoot" : "0x90a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba02cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a0ce97c31c843432fe09bc1ace378228da0a24f669409438859ac218fa55248071888ec4f911b6b41dc9f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
+                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090a354e24a4fe420e34d1e467237c07c43399dcbe314626c604180f566fc3b64a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba02cbff27367b0908e402e32ea8d9332cc83f5c534408932cd2a2d202fd34d49c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a039fec25fc565bc9d3d55f261170ea8a3fcc191dd8fe600815d4419c2e370153288fa8457e665b51b4af862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
                 "transactions" : [
                     {
                         "data" : "0x00",
@@ -350,7 +370,7 @@
                         "nonce" : "0x00",
                         "r" : "0x39083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5",
                         "s" : "0x12cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4f",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x01"
                     }
@@ -360,67 +380,186 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c8c08229471dceba721e9961f38f0a381c2450270fe2eae9cf7393afe2d0b679",
+        "lastblockhash" : "0x969f6f188abc204ef11d9bdfa01d64cb5fdfe284e58ceec97c8efd1792e8b64a",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4cf18",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e7327",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x00",
+                "code" : "0x602060006000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallTheContractToCreateEmptyContract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/CallTheContractToCreateEmptyContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xcf18",
+                    "hash" : "0xe820473251ffa4eccc74745e9679625d684a84d6b713a44c872d60c4ea2aa3aa",
+                    "mixHash" : "0x2297ab83666819508e3d3b091b12d39ee4a7d796c4f9dbbf781299cb248c3d1e",
+                    "nonce" : "0x67ec075f58b03c10",
+                    "number" : "0x01",
+                    "parentHash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+                    "receiptTrie" : "0x33f023d535fce32311a61440b263e0405058c034aee069f83492c3690dbec170",
+                    "stateRoot" : "0xeb64a67c6d5a632b6b984b85481370de1d339a417007604ec3dda13b34139575",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a05c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb64a67c6d5a632b6b984b85481370de1d339a417007604ec3dda13b34139575a02ea3be583eb7721ef3ad427a7215fc58898d58d74ec2e368d05cdadd04d95d8ba033f023d535fce32311a61440b263e0405058c034aee069f83492c3690dbec170b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf188203e880a02297ab83666819508e3d3b091b12d39ee4a7d796c4f9dbbf781299cb248c3d1e8867ec075f58b03c10f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8701001ba039083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5a012cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x00",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39083239d7b08f164c6a5bc9296378e1d1d455d3cea34148fb59f3808de745b5",
+                        "s" : "0x12cbce366ed870dc922fd7303b30fd37a85a1991145a23c2e14dca09d45f3c4f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x5c0881c586ea5e778d8eef85baf28042dc43f8fafe9e60599b1a5c0ea1795be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb70c15fcbfacf6261bbf69697163a3ab6ea0f041c52f41f1526de9a82370e99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe820473251ffa4eccc74745e9679625d684a84d6b713a44c872d60c4ea2aa3aa",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4cf18",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e7327",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x00",
                 "code" : "0x602060006000f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
deleted file mode 100644
index e325b7dc9..000000000
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-    "NotEnoughCashContractCreation_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "c117457542d117b4a92b88fdd933346b2d3e960a8af47c611da75ad383360661",
-                    "mixHash" : "b56e0d151862a2e20ce564f182e60272e6edeacf6593e3480c1eeefe98410590",
-                    "nonce" : "53083b0fd3cb803b",
-                    "number" : "0x01",
-                    "parentHash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b56e0d151862a2e20ce564f182e60272e6edeacf6593e3480c1eeefe984105908853083b0fd3cb803bc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c117457542d117b4a92b88fdd933346b2d3e960a8af47c611da75ad383360661",
-        "network" : "EIP150",
-        "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "NotEnoughCashContractCreation_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "d745ec50555f2506ed3e2815461225418694a9ad02308f8c4517aacff77b1656",
-                    "mixHash" : "7edd5c9e20beea576c651e7b688ae17d1b67548a3d6d202828a12d4def2d91f3",
-                    "nonce" : "ba8b0ca8c6cdbd9d",
-                    "number" : "0x01",
-                    "parentHash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07edd5c9e20beea576c651e7b688ae17d1b67548a3d6d202828a12d4def2d91f388ba8b0ca8c6cdbd9dc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d745ec50555f2506ed3e2815461225418694a9ad02308f8c4517aacff77b1656",
-        "network" : "EIP158",
-        "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "NotEnoughCashContractCreation_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0e96cdf6ba0759bb0f47015c407bed8f3074d3722e095eb4fbce00a85e79c863",
-                    "mixHash" : "423224871c3769b62179128379fbc3f527c5728d3460154239eaf996e10228e7",
-                    "nonce" : "b88915e81ec21a47",
-                    "number" : "0x01",
-                    "parentHash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0423224871c3769b62179128379fbc3f527c5728d3460154239eaf996e10228e788b88915e81ec21a47c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0e96cdf6ba0759bb0f47015c407bed8f3074d3722e095eb4fbce00a85e79c863",
-        "network" : "Frontier",
-        "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "NotEnoughCashContractCreation_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "175c6bcde663a8b97b64f2f5136443fd203704de430ec5ed2055b2966543b42b",
-                    "mixHash" : "f77aff8649c9af968cbde9311767f979620fb21e55a7ce9f80ac046e53b6f03c",
-                    "nonce" : "305cda54f08f962f",
-                    "number" : "0x01",
-                    "parentHash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f77aff8649c9af968cbde9311767f979620fb21e55a7ce9f80ac046e53b6f03c88305cda54f08f962fc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "175c6bcde663a8b97b64f2f5136443fd203704de430ec5ed2055b2966543b42b",
-        "network" : "Homestead",
-        "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x56a1",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0.json
new file mode 100644
index 000000000..471ea5570
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0.json
@@ -0,0 +1,409 @@
+{
+    "NotEnoughCashContractCreation_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xb59d6c3e3d86a5299bed66f580ff36704c71c04525cfecd67cec1f8ff5fe14cc",
+                    "mixHash" : "0xaf534f1fa5ff136bc4b7b676060b0018273086f58fdeff64b13dbde9c1453bdf",
+                    "nonce" : "0xe4b59c0bfb1620b1",
+                    "number" : "0x01",
+                    "parentHash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0af534f1fa5ff136bc4b7b676060b0018273086f58fdeff64b13dbde9c1453bdf88e4b59c0bfb1620b1c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb59d6c3e3d86a5299bed66f580ff36704c71c04525cfecd67cec1f8ff5fe14cc",
+        "network" : "EIP150",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NotEnoughCashContractCreation_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xbfd121482a920e922d1789ef082e16d20fc0ff108d27ef74e6d1e2d57effccf1",
+                    "mixHash" : "0x27d8a558fae4814bb864b59ba108607ba2c64efc57ea73f0cd4fa917ab9e17a9",
+                    "nonce" : "0x60ecffb549b818e6",
+                    "number" : "0x01",
+                    "parentHash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a027d8a558fae4814bb864b59ba108607ba2c64efc57ea73f0cd4fa917ab9e17a98860ecffb549b818e6c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbfd121482a920e922d1789ef082e16d20fc0ff108d27ef74e6d1e2d57effccf1",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NotEnoughCashContractCreation_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x56843c4bb2aedc604d55e44b5562c3897525d617cd798f979a823b2bbb9e04bf",
+                    "mixHash" : "0x7fd33ba03cb8859fa80e6716423ac3a5b16eab9395dd69a0971cbb9487f19c1f",
+                    "nonce" : "0x9373b9649311a2cc",
+                    "number" : "0x01",
+                    "parentHash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07fd33ba03cb8859fa80e6716423ac3a5b16eab9395dd69a0971cbb9487f19c1f889373b9649311a2ccc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x56843c4bb2aedc604d55e44b5562c3897525d617cd798f979a823b2bbb9e04bf",
+        "network" : "Frontier",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NotEnoughCashContractCreation_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x187066f5a1e8af5b7ff4ba74fee27e4e8a0def5823e1970558aa7f3cc7be72c8",
+                    "mixHash" : "0x5bf85b91bf377b83207dd4fdc09ef8a3ad6c4c9ea9f17cb639cc1f282152df48",
+                    "nonce" : "0xa966d28a4da5984c",
+                    "number" : "0x01",
+                    "parentHash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x2896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02896e24f22bac9738ce330cb649b7c2b73b6376f75778aa75782046096eec9ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05bf85b91bf377b83207dd4fdc09ef8a3ad6c4c9ea9f17cb639cc1f282152df4888a966d28a4da5984cc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x187066f5a1e8af5b7ff4ba74fee27e4e8a0def5823e1970558aa7f3cc7be72c8",
+        "network" : "Homestead",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NotEnoughCashContractCreation_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/NotEnoughCashContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xa19092a45e5366535b421d01b0c8daea8d5616a8062b0a1cdc436348839ab5e4",
+                    "mixHash" : "0x0c2ea842b736fdf0511fc3ba39d3e20ac6fe17c8d23fc049017d64da9e44252f",
+                    "nonce" : "0x7e3f03c5431f18b1",
+                    "number" : "0x01",
+                    "parentHash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xffc132f9914ee9d97db5b7919c1d81b432a6512db64ff30b5fb7a0e3beebdc60",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffc132f9914ee9d97db5b7919c1d81b432a6512db64ff30b5fb7a0e3beebdc60a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00c2ea842b736fdf0511fc3ba39d3e20ac6fe17c8d23fc049017d64da9e44252f887e3f03c5431f18b1c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x688686a65dde0975e2db72c7e55d2b96e788b4e1f454a9820dcd7c777cc11734",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f10846403945e764b907151f573ce337b6a5a1d0f51b43bfbb59af88a9991ab2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa19092a45e5366535b421d01b0c8daea8d5616a8062b0a1cdc436348839ab5e4",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x56a1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation_d0g0v0.json
index 4f8a1ca99..46ad57064 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "OutOfGasContractCreation_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "d116182e2947490e3857b6cedf6b8298969cb8bf776e08765c622618b4a56fb9",
-                    "mixHash" : "ee97cc186a6a11124a3e283d788edd45c9a3b9ba46756b902fe0e9b9ce57d461",
-                    "nonce" : "8f7df0e873361773",
+                    "hash" : "0x6a57eb808da0864de852bfa197c867e4985e37a5255b91e5145502c3adf9bf70",
+                    "mixHash" : "0x301ca8e6bf4ec4c0c4aacf3832107c5c873cf6cdcb373f6f52dec71f18164875",
+                    "nonce" : "0xc0c4f2ac69e2cb2a",
                     "number" : "0x01",
-                    "parentHash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ff",
+                    "parentHash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0ee97cc186a6a11124a3e283d788edd45c9a3b9ba46756b902fe0e9b9ce57d461888f7df0e873361773c0c0",
+                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0301ca8e6bf4ec4c0c4aacf3832107c5c873cf6cdcb373f6f52dec71f1816487588c0c4f2ac69e2cb2ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,46 +33,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d116182e2947490e3857b6cedf6b8298969cb8bf776e08765c622618b4a56fb9",
+        "lastblockhash" : "0x6a57eb808da0864de852bfa197c867e4985e37a5255b91e5145502c3adf9bf70",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,27 +80,32 @@
         }
     },
     "OutOfGasContractCreation_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "dda3ff6a17b092f6a457e3b93e32411c9d0238a1c77c388f8f946a53e41fcaa3",
-                    "mixHash" : "2693bf9d10d0a1c93e0cbb5348b6ed5c1db638e5fd57aa1354cff8f222b77f76",
-                    "nonce" : "3098f8ef77c8ee13",
+                    "hash" : "0xd33993f834b1e4ceb45e4dd9b7bee45927854bb61c14091d6a3d25cc9976fee9",
+                    "mixHash" : "0xd44e89a41425101e90af6a1d5abcbd3f04a65870014d77d8a26597b55b3abe4a",
+                    "nonce" : "0x941645f8d3bdbaac",
                     "number" : "0x01",
-                    "parentHash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ff",
+                    "parentHash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a02693bf9d10d0a1c93e0cbb5348b6ed5c1db638e5fd57aa1354cff8f222b77f76883098f8ef77c8ee13c0c0",
+                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0d44e89a41425101e90af6a1d5abcbd3f04a65870014d77d8a26597b55b3abe4a88941645f8d3bdbaacc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -103,46 +113,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "dda3ff6a17b092f6a457e3b93e32411c9d0238a1c77c388f8f946a53e41fcaa3",
+        "lastblockhash" : "0xd33993f834b1e4ceb45e4dd9b7bee45927854bb61c14091d6a3d25cc9976fee9",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -150,27 +160,32 @@
         }
     },
     "OutOfGasContractCreation_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xd2f0",
-                    "hash" : "93ec67bdc612b479efa1fef6adc60594f810f6156be940828f71ab451377e711",
-                    "mixHash" : "c996357a9f2a95275cbd1ec2cdc97ca0e5bc4cab279dbcf625ee772d7e9335c7",
-                    "nonce" : "6dd4a8ca6d76ba19",
+                    "hash" : "0xe9965a89670790e814e7f53a9bb56c1d7bec7367021fb549faa9d7d855289948",
+                    "mixHash" : "0xe7a081a2422f14970bf2f2b754cbefeab1529d1a294d7ae875b725e475b0318f",
+                    "nonce" : "0x9dc43c37143e485e",
                     "number" : "0x01",
-                    "parentHash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-                    "receiptTrie" : "89818ac59d3ced1362f6481e6ffbd0771ae579801b06c455b4209d0deb41edc0",
-                    "stateRoot" : "cc27e84fb7ff11c0eb7b6013ddf927746f1d2d0a8d6660d8cf30da69317ef5c0",
+                    "parentHash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+                    "receiptTrie" : "0x89818ac59d3ced1362f6481e6ffbd0771ae579801b06c455b4209d0deb41edc0",
+                    "stateRoot" : "0xcc27e84fb7ff11c0eb7b6013ddf927746f1d2d0a8d6660d8cf30da69317ef5c0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc27e84fb7ff11c0eb7b6013ddf927746f1d2d0a8d6660d8cf30da69317ef5c0a0b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024a089818ac59d3ced1362f6481e6ffbd0771ae579801b06c455b4209d0deb41edc0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d2f08203e880a0c996357a9f2a95275cbd1ec2cdc97ca0e5bc4cab279dbcf625ee772d7e9335c7886dd4a8ca6d76ba19f863f861800382d2f0800196600a80600c6000396000f200600160008035811a81001ba09fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749da0066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19c0",
+                "rlp" : "0xf90261f901f8a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc27e84fb7ff11c0eb7b6013ddf927746f1d2d0a8d6660d8cf30da69317ef5c0a0b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024a089818ac59d3ced1362f6481e6ffbd0771ae579801b06c455b4209d0deb41edc0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d2f08203e880a0e7a081a2422f14970bf2f2b754cbefeab1529d1a294d7ae875b725e475b0318f889dc43c37143e485ef863f861800382d2f0800196600a80600c6000396000f200600160008035811a81001ba09fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749da0066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200600160008035811a8100",
@@ -189,46 +204,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "93ec67bdc612b479efa1fef6adc60594f810f6156be940828f71ab451377e711",
+        "lastblockhash" : "0xe9965a89670790e814e7f53a9bb56c1d7bec7367021fb549faa9d7d855289948",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f678d0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0cc970",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -236,27 +251,32 @@
         }
     },
     "OutOfGasContractCreation_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "9d0b0de3a2df26c8e79d7db59fe4710b20cb86fb358b2201e539e4ca129e0305",
-                    "mixHash" : "e943efe2dbb115ba5b08b146d2ab21b1ad8e5fd4e92b0a8b4eab41cfe4148c19",
-                    "nonce" : "2236c91a6c14dc24",
+                    "hash" : "0x8e641622eca58221392cb5a0151192fd04d71c2cacc129f226fbf8d9871eb0eb",
+                    "mixHash" : "0x7ab5456269a9c637d9626f2b2550070c1ce3584eed60cde97a47a0372500c17a",
+                    "nonce" : "0xf34a6b31a4dbdf96",
                     "number" : "0x01",
-                    "parentHash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ff",
+                    "parentHash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0e943efe2dbb115ba5b08b146d2ab21b1ad8e5fd4e92b0a8b4eab41cfe4148c19882236c91a6c14dc24c0c0",
+                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0880c26637573dbbdfc22d119722cfc9b22a6e3140a56e6733906ccf2198b82ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a07ab5456269a9c637d9626f2b2550070c1ce3584eed60cde97a47a0372500c17a88f34a6b31a4dbdf96c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -264,46 +284,133 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9d0b0de3a2df26c8e79d7db59fe4710b20cb86fb358b2201e539e4ca129e0305",
+        "lastblockhash" : "0x8e641622eca58221392cb5a0151192fd04d71c2cacc129f226fbf8d9871eb0eb",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "OutOfGasContractCreation_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xeb8f11aebe30fa2625ea154b73e613595a32dcff4ef76640b2dbeae8b782955b",
+                    "mixHash" : "0x811f9666b86b0f9e03aa9dd901f0ac8ce93b87c0a4ef8f621c66b23bfa2ab0bf",
+                    "nonce" : "0xaa95df884dd6b635",
+                    "number" : "0x01",
+                    "parentHash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x604a321b44e112a20cfc540947204e97a2c856b0ecf508a463487688051e10e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901fbf901f6a00b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0604a321b44e112a20cfc540947204e97a2c856b0ecf508a463487688051e10e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0811f9666b86b0f9e03aa9dd901f0ac8ce93b87c0a4ef8f621c66b23bfa2ab0bf88aa95df884dd6b635c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x0b621c0095ed6506c5f61b302a584795aa5ef892757897dc472aad39bbe2a781",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x18c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018c1342886baeaf926b3fbbfb0484bf0cd1ced43576547c11153d3c8944d5c47a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeb8f11aebe30fa2625ea154b73e613595a32dcff4ef76640b2dbeae8b782955b",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0.json
index c96e62348..1ba176c2a 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "OutOfGasPrefundedContractCreation_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "66844e6cfe5985229d2d04c325f749c5be3da7607c7431f4aceade925d2b6386",
-                    "mixHash" : "cf241e971a180e56c8327b2faf4364a6565b7e2fe61395361cd8b5a2d3c1476d",
-                    "nonce" : "517afb46d9c12ad9",
+                    "hash" : "0x2d7d670ff5bcdcaace951f7732256dcb75795107661857c05eeb64c062d1d8dd",
+                    "mixHash" : "0xfcf4612b7000203242ef7e02eeb73dd0bb54a78514f3d119929b02e42426ae9d",
+                    "nonce" : "0xb92932418e3514a0",
                     "number" : "0x01",
-                    "parentHash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
+                    "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0cf241e971a180e56c8327b2faf4364a6565b7e2fe61395361cd8b5a2d3c1476d88517afb46d9c12ad9c0c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0fcf4612b7000203242ef7e02eeb73dd0bb54a78514f3d119929b02e42426ae9d88b92932418e3514a0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,60 +33,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "66844e6cfe5985229d2d04c325f749c5be3da7607c7431f4aceade925d2b6386",
+        "lastblockhash" : "0x2d7d670ff5bcdcaace951f7732256dcb75795107661857c05eeb64c062d1d8dd",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -89,27 +94,32 @@
         }
     },
     "OutOfGasPrefundedContractCreation_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "f56d8b84d36265cae0bab1bda8f21e57923e8b3ae49633ac0f5081a5812a3635",
-                    "mixHash" : "9107d9ba726164c1a6e033f114d63b49779fafc4e6db5c78a8cca4e429c9c4c0",
-                    "nonce" : "81f7494045d07eb5",
+                    "hash" : "0xce7e4d581b2ba77f87acd63925ebd4dbb350592b2eaa7d5747f33f8cdbfa5c67",
+                    "mixHash" : "0x3a47cb57a467d39f1e5b4e0768e635eab8d28113bd857ab45738103a3e6f929e",
+                    "nonce" : "0xe4c3f7208d363ffd",
                     "number" : "0x01",
-                    "parentHash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
+                    "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a09107d9ba726164c1a6e033f114d63b49779fafc4e6db5c78a8cca4e429c9c4c08881f7494045d07eb5c0c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a03a47cb57a467d39f1e5b4e0768e635eab8d28113bd857ab45738103a3e6f929e88e4c3f7208d363ffdc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -117,60 +127,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f56d8b84d36265cae0bab1bda8f21e57923e8b3ae49633ac0f5081a5812a3635",
+        "lastblockhash" : "0xce7e4d581b2ba77f87acd63925ebd4dbb350592b2eaa7d5747f33f8cdbfa5c67",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -178,27 +188,32 @@
         }
     },
     "OutOfGasPrefundedContractCreation_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xd2f0",
-                    "hash" : "4ba4e6be6508527add7c289dd3eb1bd63c16c658e2b057d8ac6fbeb6beaa6ba4",
-                    "mixHash" : "e7c4718337576e5c345b364ac6e176db779909657f0ecd1fd53898c62349fb1f",
-                    "nonce" : "d50fe575e02155bb",
+                    "hash" : "0xe0cb8353cc625348bbade7002c9398065f6fffe1c8569953c1db93a9dee08a07",
+                    "mixHash" : "0x912806ccd13752c8f710a547c2fae97c1d53f786e32215d65b6ccbf4ba0350b0",
+                    "nonce" : "0x1799b8c67c652a1f",
                     "number" : "0x01",
-                    "parentHash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-                    "receiptTrie" : "084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378",
-                    "stateRoot" : "7be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838",
+                    "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+                    "receiptTrie" : "0x084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378",
+                    "stateRoot" : "0x7be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838a0b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024a0084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d2f08203e880a0e7c4718337576e5c345b364ac6e176db779909657f0ecd1fd53898c62349fb1f88d50fe575e02155bbf863f861800382d2f0800196600a80600c6000396000f200600160008035811a81001ba09fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749da0066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19c0",
+                "rlp" : "0xf90261f901f8a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838a0b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024a0084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d2f08203e880a0912806ccd13752c8f710a547c2fae97c1d53f786e32215d65b6ccbf4ba0350b0881799b8c67c652a1ff863f861800382d2f0800196600a80600c6000396000f200600160008035811a81001ba09fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749da0066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200600160008035811a8100",
@@ -217,60 +232,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4ba4e6be6508527add7c289dd3eb1bd63c16c658e2b057d8ac6fbeb6beaa6ba4",
+        "lastblockhash" : "0xe0cb8353cc625348bbade7002c9398065f6fffe1c8569953c1db93a9dee08a07",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f678d0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0cc970",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -278,27 +293,32 @@
         }
     },
     "OutOfGasPrefundedContractCreation_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "60c0e2e07966b67b824e8177d1dec2bd5c474825e0f8f80cdb0c6c4e23940076",
-                    "mixHash" : "2f1055eabe9a3c41e28be44a4ddefdf4708934843464a1fc54abcfb18965de06",
-                    "nonce" : "007e36857678e588",
+                    "hash" : "0xad853372ac075299d986361cc347cb6ac11a407ac8eeee1830f6840428c7512c",
+                    "mixHash" : "0x76bd781d4cca0154e382cbe27c18da2cb4132f4b56cd1d0d6c388fae364a2fd6",
+                    "nonce" : "0x0cb3b6978904c125",
                     "number" : "0x01",
-                    "parentHash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
+                    "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a02f1055eabe9a3c41e28be44a4ddefdf4708934843464a1fc54abcfb18965de0688007e36857678e588c0c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a076bd781d4cca0154e382cbe27c18da2cb4132f4b56cd1d0d6c388fae364a2fd6880cb3b6978904c125c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -306,60 +326,161 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x05f5e100",
             "gasUsed" : "0x00",
-            "hash" : "eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "60c0e2e07966b67b824e8177d1dec2bd5c474825e0f8f80cdb0c6c4e23940076",
+        "lastblockhash" : "0xad853372ac075299d986361cc347cb6ac11a407ac8eeee1830f6840428c7512c",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "OutOfGasPrefundedContractCreation_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x6a87466aeb83f9646c168b2a73870ca9e79ce2508eb827b3ee18bc9000cf379f",
+                    "mixHash" : "0xc792223fc65b33027b68fd00d2c4e042f3af6528098a98739f3176795ca27063",
+                    "nonce" : "0xaac191c0e076f220",
+                    "number" : "0x01",
+                    "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x3e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0c792223fc65b33027b68fd00d2c4e042f3af6528098a98739f3176795ca2706388aac191c0e076f220c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a87466aeb83f9646c168b2a73870ca9e79ce2508eb827b3ee18bc9000cf379f",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest2.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest2_d0g0v0.json
index 392ebd214..fff54ef8a 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest2.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "ReturnTest2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x3b9aca00",
                     "gasUsed" : "0xf15f",
-                    "hash" : "48cbe0159bf6e4d7e0e45aa5878ec3e9df5c5289e0a34c409507e7e2844d0060",
-                    "mixHash" : "26619439d420ddce3b55c932d67380385da19cf9a093583ca35ba45c6e6a36b3",
-                    "nonce" : "7e00ee083df8df19",
+                    "hash" : "0xf517a1e229ad28e83ce398adafa24a988ac0a5c09a162735c69ca5dd5c16a51f",
+                    "mixHash" : "0x67f27b9228ee246a6f58f4eabdd775fb7ec628d4543cfb1825662b37ddcf1d79",
+                    "nonce" : "0x8e17b7111d20faa2",
                     "number" : "0x01",
-                    "parentHash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-                    "receiptTrie" : "223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcad",
-                    "stateRoot" : "f34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2",
+                    "parentHash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+                    "receiptTrie" : "0x223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcad",
+                    "stateRoot" : "0xf34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a0223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcadb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082f15f8203e880a026619439d420ddce3b55c932d67380385da19cf9a093583ca35ba45c6e6a36b3887e00ee083df8df19f862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
+                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a0223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcadb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082f15f8203e880a067f27b9228ee246a6f58f4eabdd775fb7ec628d4543cfb1825662b37ddcf1d79888e17b7111d20faa2f862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x03d090",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x40400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827",
                         "s" : "0x0cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x3b9aca00",
             "gasUsed" : "0x00",
-            "hash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080843b9aca00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "48cbe0159bf6e4d7e0e45aa5878ec3e9df5c5289e0a34c409507e7e2844d0060",
+        "lastblockhash" : "0xf517a1e229ad28e83ce398adafa24a988ac0a5c09a162735c69ca5dd5c16a51f",
         "network" : "EIP150",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
@@ -69,21 +74,21 @@
                     "0x01" : "0x3f"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f15f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e50e1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -92,21 +97,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -116,36 +121,41 @@
         }
     },
     "ReturnTest2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x3b9aca00",
                     "gasUsed" : "0xf15f",
-                    "hash" : "2be05072910741427bd7f078c9bd4761e1b894c43bd2997223431a0d893af977",
-                    "mixHash" : "51115a2f450c4d7df1b351c23270fa52c701a312fb6f100697f246902efb6d0e",
-                    "nonce" : "8fe5f432e58e48da",
+                    "hash" : "0xf376e8eac5da14a3f60aaf3808421a676a00e542db5ea9cef2ec1b5e3c57d740",
+                    "mixHash" : "0x6e06acdd09667e8bdca968725fc02bf487945f0a699517bc00566d0b0ebf0e41",
+                    "nonce" : "0x2211d45b42ab3ab7",
                     "number" : "0x01",
-                    "parentHash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-                    "receiptTrie" : "223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcad",
-                    "stateRoot" : "f34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2",
+                    "parentHash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+                    "receiptTrie" : "0x223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcad",
+                    "stateRoot" : "0xf34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a0223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcadb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082f15f8203e880a051115a2f450c4d7df1b351c23270fa52c701a312fb6f100697f246902efb6d0e888fe5f432e58e48daf862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
+                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f34d8e209e9d434dcdcd66eae7ffd5bc641866516ed1aec97789278dcc4c73a2a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a0223a046c3c3345691c0a002ff05fdcc1e6151fc2cefe0bf751919eebb725dcadb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082f15f8203e880a06e06acdd09667e8bdca968725fc02bf487945f0a699517bc00566d0b0ebf0e41882211d45b42ab3ab7f862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x03d090",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x40400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827",
                         "s" : "0x0cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x3b9aca00",
             "gasUsed" : "0x00",
-            "hash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080843b9aca00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2be05072910741427bd7f078c9bd4761e1b894c43bd2997223431a0d893af977",
+        "lastblockhash" : "0xf376e8eac5da14a3f60aaf3808421a676a00e542db5ea9cef2ec1b5e3c57d740",
         "network" : "EIP158",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
@@ -185,21 +195,21 @@
                     "0x01" : "0x3f"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f15f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e50e1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -208,21 +218,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -232,36 +242,41 @@
         }
     },
     "ReturnTest2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x3b9aca00",
                     "gasUsed" : "0xeecb",
-                    "hash" : "bfa5b67fbb93ee351f4bc5acbc4aff98da695880c08dda071dd613c5592ebe6a",
-                    "mixHash" : "9ed3b5b6567e38d5f157a2b7b2b47b0660453fe8379c50df4dee70267442ba61",
-                    "nonce" : "cebc8c1550f6e7c1",
+                    "hash" : "0xcacaa40f68d0ce9d3d4a6efa89f92602b95513fbc302080bb7822d6306a3d801",
+                    "mixHash" : "0xf39e9b534dd7bc3f172ce5e4b04d603e35b9cecb74e86941bb32dce8e8193447",
+                    "nonce" : "0x6d40898ed78abef0",
                     "number" : "0x01",
-                    "parentHash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-                    "receiptTrie" : "5a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27",
-                    "stateRoot" : "52926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052",
+                    "parentHash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+                    "receiptTrie" : "0x5a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27",
+                    "stateRoot" : "0x52926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a05a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082eecb8203e880a09ed3b5b6567e38d5f157a2b7b2b47b0660453fe8379c50df4dee70267442ba6188cebc8c1550f6e7c1f862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
+                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a05a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082eecb8203e880a0f39e9b534dd7bc3f172ce5e4b04d603e35b9cecb74e86941bb32dce8e8193447886d40898ed78abef0f862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x03d090",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x40400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827",
                         "s" : "0x0cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,28 +286,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x3b9aca00",
             "gasUsed" : "0x00",
-            "hash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080843b9aca00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bfa5b67fbb93ee351f4bc5acbc4aff98da695880c08dda071dd613c5592ebe6a",
+        "lastblockhash" : "0xcacaa40f68d0ce9d3d4a6efa89f92602b95513fbc302080bb7822d6306a3d801",
         "network" : "Frontier",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
@@ -301,21 +316,21 @@
                     "0x01" : "0x3f"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4eecb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e5375",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -324,21 +339,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -348,36 +363,41 @@
         }
     },
     "ReturnTest2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x3b9aca00",
                     "gasUsed" : "0xeecb",
-                    "hash" : "1b6293d21b4b9b59b6db0ee5873bc128ed20795566f377cfaee560264fef7003",
-                    "mixHash" : "ffb3e53b7b96ab6d8d7fbbcf4ca66afcaf000588ed92cf1eee18d498c2b0d494",
-                    "nonce" : "9e88368cdf6e74cb",
+                    "hash" : "0x7cd82ea18d015a8e52a20d8e8ec6698f79f22c3211d1a40b24a7a8aadeda9bde",
+                    "mixHash" : "0x55a6ef65227251e08648ed230c8cb2150253943532489bcec873f2bd1bac35c4",
+                    "nonce" : "0x8c3e1aaeba0b6ba8",
                     "number" : "0x01",
-                    "parentHash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-                    "receiptTrie" : "5a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27",
-                    "stateRoot" : "52926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052",
+                    "parentHash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+                    "receiptTrie" : "0x5a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27",
+                    "stateRoot" : "0x52926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a05a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082eecb8203e880a0ffb3e53b7b96ab6d8d7fbbcf4ca66afcaf000588ed92cf1eee18d498c2b0d494889e88368cdf6e74cbf862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
+                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa052926828deaba0bdbc43921fe7737c95e457841128035a206107812f17053052a0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a05a35eec77ca1c028886bd3a22913a94f61d9204fb79fc87d0e5b1bbed55c9d27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082eecb8203e880a055a6ef65227251e08648ed230c8cb2150253943532489bcec873f2bd1bac35c4888c3e1aaeba0b6ba8f862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x03d090",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x40400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827",
                         "s" : "0x0cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -387,28 +407,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x3b9aca00",
             "gasUsed" : "0x00",
-            "hash" : "bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080843b9aca00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1b6293d21b4b9b59b6db0ee5873bc128ed20795566f377cfaee560264fef7003",
+        "lastblockhash" : "0x7cd82ea18d015a8e52a20d8e8ec6698f79f22c3211d1a40b24a7a8aadeda9bde",
         "network" : "Homestead",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
@@ -417,21 +437,149 @@
                     "0x01" : "0x3f"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4eecb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e5375",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560030260005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560030260005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ReturnTest2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3b9aca00",
+                    "gasUsed" : "0xf15f",
+                    "hash" : "0xcfc43c3a2748edb07e3fd4f9cf50ff1da140cb624427bf2cf48a40fab9bbc98c",
+                    "mixHash" : "0xeb77f1fd93b00e44a72ec3a48e816166c03bf7001d619c8795ac67b3a347a6cf",
+                    "nonce" : "0xb3bf744865d17c2b",
+                    "number" : "0x01",
+                    "parentHash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+                    "receiptTrie" : "0xaf2d14f7f0d7fec8f1c7b2a19528e892fd6ce383a7c9b82fc601439fff3b6952",
+                    "stateRoot" : "0xecc9a2a4c6088b2e2d65e15562a80fe0ce4203d578a6c6d101ac9c533a7a30ff",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecc9a2a4c6088b2e2d65e15562a80fe0ce4203d578a6c6d101ac9c533a7a30ffa0714f2dbf5a5c30b30264417545757fe69da878802c4ec75e9fd1c1be9988a148a0af2d14f7f0d7fec8f1c7b2a19528e892fd6ce383a7c9b82fc601439fff3b6952b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001843b9aca0082f15f8203e880a0eb77f1fd93b00e44a72ec3a48e816166c03bf7001d619c8795ac67b3a347a6cf88b3bf744865d17c2bf862f86080018303d09094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba040400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827a00cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x03d090",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40400852d7bed4663d6174943fa640fcc4f146f8e849b92a6cae735cdf2fc827",
+                        "s" : "0x0cdc17ce38a87eedda06d9d1c7c98ef9a083c0a200a1ac1a4fe9d439ace32fc0",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x3b9aca00",
+            "gasUsed" : "0x00",
+            "hash" : "0xbf6a8fa3509dc300e4dbb91fd1e873d829032d3f4cbb8653efa8cadc78c382c5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ed89d6d9000eeca305300d724880533bf15a8e4a9dde3d35952ad0f22461d7ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080843b9aca00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcfc43c3a2748edb07e3fd4f9cf50ff1da140cb624427bf2cf48a40fab9bbc98c",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x15",
+                    "0x01" : "0x3f"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f15f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e50e1",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
@@ -440,21 +588,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x60156000526020602060206000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b611b58f15060005160005560205160015560406000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560030260005260206000f3",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest_d0g0v0.json
index 2c53bc8ab..367dc2938 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/ReturnTest_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "ReturnTest_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa31f",
-                    "hash" : "dae5732b70af747e5f6f07502039780c7a61ff59ed633b0d81c48de0780b9769",
-                    "mixHash" : "904c69fd3d75b0b3f21ed3869cbd7fcab2609c404189e5c6bad1465f011201c5",
-                    "nonce" : "23c8264232232e94",
+                    "hash" : "0x3977a930ddf2c9ef99dba4af7f337d3917c50e950a1fb8ed44429e82380c750b",
+                    "mixHash" : "0xa0a49ecec315f85a3461e49029ef70ffb344b4138ff667394aeb18d7d12659b0",
+                    "nonce" : "0x90c5703a190c4389",
                     "number" : "0x01",
-                    "parentHash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-                    "receiptTrie" : "b0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537d",
-                    "stateRoot" : "7e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0",
+                    "parentHash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+                    "receiptTrie" : "0xb0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537d",
+                    "stateRoot" : "0x7e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a0b0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a31f8203e880a0904c69fd3d75b0b3f21ed3869cbd7fcab2609c404189e5c6bad1465f011201c58823c8264232232e94f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
+                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a0b0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a31f8203e880a0a0a49ecec315f85a3461e49029ef70ffb344b4138ff667394aeb18d7d12659b08890c5703a190c4389f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x20da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9",
                         "s" : "0x01a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "dae5732b70af747e5f6f07502039780c7a61ff59ed633b0d81c48de0780b9769",
+        "lastblockhash" : "0x3977a930ddf2c9ef99dba4af7f337d3917c50e950a1fb8ed44429e82380c750b",
         "network" : "EIP150",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
@@ -68,21 +73,21 @@
                     "0x00" : "0x15"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a31f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e9f21",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -91,21 +96,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -115,36 +120,41 @@
         }
     },
     "ReturnTest_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa31f",
-                    "hash" : "59210ba07682f8fbb5bea0a61eb6f45be19b5edadb259ba61d4b305a7919e2ec",
-                    "mixHash" : "f8a10f3c42ea10c644712ab91289f4478e5a7f4a5a5661db7c00878ec0525d65",
-                    "nonce" : "40a4befc68b08124",
+                    "hash" : "0x7006709a8438cc71a904639d109c186a6fc36f7caf1bb8003470452c2eb914a7",
+                    "mixHash" : "0x3d81c15506183f491bada119200f5995938d257f74e52f6c444c04e1c50c5c43",
+                    "nonce" : "0x7d652419069c1208",
                     "number" : "0x01",
-                    "parentHash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-                    "receiptTrie" : "b0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537d",
-                    "stateRoot" : "7e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0",
+                    "parentHash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+                    "receiptTrie" : "0xb0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537d",
+                    "stateRoot" : "0x7e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a0b0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a31f8203e880a0f8a10f3c42ea10c644712ab91289f4478e5a7f4a5a5661db7c00878ec0525d658840a4befc68b08124f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
+                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e147a0198ba937fce0cfe4989cdff660a0d0fdcb3b206f7988b0eb113395cc0a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a0b0443e0966e248f345b2c003b209beefdf3d460e2bdc36fa189d7734f7a7537db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a31f8203e880a03d81c15506183f491bada119200f5995938d257f74e52f6c444c04e1c50c5c43887d652419069c1208f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x20da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9",
                         "s" : "0x01a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -154,28 +164,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "59210ba07682f8fbb5bea0a61eb6f45be19b5edadb259ba61d4b305a7919e2ec",
+        "lastblockhash" : "0x7006709a8438cc71a904639d109c186a6fc36f7caf1bb8003470452c2eb914a7",
         "network" : "EIP158",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
@@ -183,21 +193,21 @@
                     "0x00" : "0x15"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a31f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0e9f21",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -206,21 +216,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -230,36 +240,41 @@
         }
     },
     "ReturnTest_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa08b",
-                    "hash" : "d70f61f5cb75976c65fddd4ed3b5a2f68713d2237e989ed58640a4ea35e871d8",
-                    "mixHash" : "0eab4f62178eda1fd4e5481baf541bc8504b6413125d8303fd9d12f85f0785cc",
-                    "nonce" : "405429dcecf3f998",
+                    "hash" : "0x135b36b47d4a18c8a7c8589e0685fdd15784aa383e8da1b15d32457d2cc6b576",
+                    "mixHash" : "0x442a30c8e506569e6882402b6fcc836bdb786cdcf2ff43204d2964bf64340d11",
+                    "nonce" : "0xb39e628b51a29139",
                     "number" : "0x01",
-                    "parentHash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-                    "receiptTrie" : "4ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2",
-                    "stateRoot" : "cc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8",
+                    "parentHash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+                    "receiptTrie" : "0x4ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2",
+                    "stateRoot" : "0xcc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a04ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08b8203e880a00eab4f62178eda1fd4e5481baf541bc8504b6413125d8303fd9d12f85f0785cc88405429dcecf3f998f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
+                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a04ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08b8203e880a0442a30c8e506569e6882402b6fcc836bdb786cdcf2ff43204d2964bf64340d1188b39e628b51a29139f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x20da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9",
                         "s" : "0x01a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -269,28 +284,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d70f61f5cb75976c65fddd4ed3b5a2f68713d2237e989ed58640a4ea35e871d8",
+        "lastblockhash" : "0x135b36b47d4a18c8a7c8589e0685fdd15784aa383e8da1b15d32457d2cc6b576",
         "network" : "Frontier",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
@@ -298,21 +313,21 @@
                     "0x00" : "0x15"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a08b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ea1b5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -321,21 +336,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -345,36 +360,41 @@
         }
     },
     "ReturnTest_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa08b",
-                    "hash" : "e9fe8866bda04c34938fba2f9d7bb5c10cfd386ec2923664b8505f1a68235008",
-                    "mixHash" : "d5d99a3b51d2b4b1f68564f69608143e4b1771bf095851bf615af61b66925762",
-                    "nonce" : "280b502fe8d7fd56",
+                    "hash" : "0x048ee456e4bf95e2b08cf28984c76c6f4fd891f7c1218dfc9d038ded158838bc",
+                    "mixHash" : "0x3ff5e4fcd9b6337dd917789c8a6e0a133117c70cb0e846ba7ae450042e8d5ad1",
+                    "nonce" : "0x5aefaba9e8411d54",
                     "number" : "0x01",
-                    "parentHash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-                    "receiptTrie" : "4ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2",
-                    "stateRoot" : "cc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8",
+                    "parentHash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+                    "receiptTrie" : "0x4ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2",
+                    "stateRoot" : "0xcc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a04ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08b8203e880a0d5d99a3b51d2b4b1f68564f69608143e4b1771bf095851bf615af61b6692576288280b502fe8d7fd56f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
+                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc033ba43062a4e72e09a0fd6a14e8d5be58b11bc37cd5f81bdfa05899b016d8a0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a04ad56f16d57937c3d2c822e21e8342961587b987061a0f6343d4c54c03e3c8a2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a08b8203e880a03ff5e4fcd9b6337dd917789c8a6e0a133117c70cb0e846ba7ae450042e8d5ad1885aefaba9e8411d54f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x20da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9",
                         "s" : "0x01a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555",
-                        "to" : "194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -384,28 +404,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e9fe8866bda04c34938fba2f9d7bb5c10cfd386ec2923664b8505f1a68235008",
+        "lastblockhash" : "0x048ee456e4bf95e2b08cf28984c76c6f4fd891f7c1218dfc9d038ded158838bc",
         "network" : "Homestead",
         "postState" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
@@ -413,21 +433,148 @@
                     "0x00" : "0x15"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a08b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ea1b5",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60156000526001601ff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60156000526001601ff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ReturnTest_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/ReturnTest_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xa31f",
+                    "hash" : "0xcabe4ac31d7c6a3278c338dded64cf9c0d36a975cfe9689f98c9955deaebdc22",
+                    "mixHash" : "0x0b9930cdf2c16af71dd1c007cb33af94d7497a762722b3b3544ed360d15d4f5d",
+                    "nonce" : "0xac2d5888852b9252",
+                    "number" : "0x01",
+                    "parentHash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+                    "receiptTrie" : "0x05df975c6a42b362001fb5a94e0fbce146e1a6bd47870a399f92defeed1f093d",
+                    "stateRoot" : "0x61613f331b15600ac22bd34cc11b8678403cc2b9557f03e4d10ab20efcf8674c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a046c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061613f331b15600ac22bd34cc11b8678403cc2b9557f03e4d10ab20efcf8674ca0503f1d6935235f7b7d9d33ff9771fba4c3e8271ddd595fd8b8f29b445b460078a005df975c6a42b362001fb5a94e0fbce146e1a6bd47870a399f92defeed1f093db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a31f8203e880a00b9930cdf2c16af71dd1c007cb33af94d7497a762722b3b3544ed360d15d4f5d88ac2d5888852b9252f862f8608001830493e094194f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba020da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9a001a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20da68794ae547ca605073f401fa13b957d3a93590822aa791bf7e5bb04bfad9",
+                        "s" : "0x01a3212c79d7cbac919724f07da0e43302b7c10d14cba594aadc4220cc735555",
+                        "to" : "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x46c7a10b4cc92c1c62866cdc3739b2aa43b5efedf11ae4db8315a0e17616507e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff82e05817d00564d38785ec95dd34c0d382b91fb6ba20b20d74efca6b2f2639a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcabe4ac31d7c6a3278c338dded64cf9c0d36a975cfe9689f98c9955deaebdc22",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x15"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a31f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e9f21",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
@@ -436,21 +583,21 @@
             }
         },
         "pre" : {
-            "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0x194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6001601f6001601e600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6107d0f1506000516000556002601ef3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60156000526001601ff3",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0.json
index 0387df346..993cdc88f 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "StackUnderFlowContractCreation_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011940",
-                    "hash" : "28bad0fe5657db7231edc4d2cb7f4201158c68a2448e028ace0d485b3b2b3545",
-                    "mixHash" : "bb791c0c1b41ca2c942f3cc2992a21606aa9147359d27c62d5db5fb1bfa2066a",
-                    "nonce" : "130ec542ecaefc22",
+                    "hash" : "0x5a8039e624ae2eccab229b1dd3464faf50d06edfcfc18fd6dee95348a3516fe8",
+                    "mixHash" : "0x6c2cc4121ba72f5d617b2263a9c039104bfb7e74a69d5c1cea496e1fc6d3ea8a",
+                    "nonce" : "0x0e9b58f2f994648f",
                     "number" : "0x01",
-                    "parentHash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-                    "receiptTrie" : "5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
-                    "stateRoot" : "453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
+                    "parentHash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+                    "receiptTrie" : "0x5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
+                    "stateRoot" : "0x453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a0bb791c0c1b41ca2c942f3cc2992a21606aa9147359d27c62d5db5fb1bfa2066a88130ec542ecaefc22f851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
+                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a06c2cc4121ba72f5d617b2263a9c039104bfb7e74a69d5c1cea496e1fc6d3ea8a880e9b58f2f994648ff851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
                 "transactions" : [
                     {
                         "data" : "0x6000f1",
@@ -39,46 +44,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "28bad0fe5657db7231edc4d2cb7f4201158c68a2448e028ace0d485b3b2b3545",
+        "lastblockhash" : "0x5a8039e624ae2eccab229b1dd3464faf50d06edfcfc18fd6dee95348a3516fe8",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0bb8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0124f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,27 +91,32 @@
         }
     },
     "StackUnderFlowContractCreation_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011940",
-                    "hash" : "ef577e2bda2b21fa50506987851c65cf3e9c1df8f82591247a58dabadf9f6d3e",
-                    "mixHash" : "b89b33a2e9888d142237533576c5f35c6a71563457b7fb6b34c558d553c906fb",
-                    "nonce" : "18ef1d0314e91be6",
+                    "hash" : "0x70ece123f6df0a9458449d1137a2b69d66aa52b848cbc87399647f8798d666cf",
+                    "mixHash" : "0xa8244e76d0a21691dcc8bae921093237ca58123db6a8d05304b6edb2fc13d6f5",
+                    "nonce" : "0x6c8308756b6b1d02",
                     "number" : "0x01",
-                    "parentHash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-                    "receiptTrie" : "5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
-                    "stateRoot" : "453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
+                    "parentHash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+                    "receiptTrie" : "0x5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
+                    "stateRoot" : "0x453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a0b89b33a2e9888d142237533576c5f35c6a71563457b7fb6b34c558d553c906fb8818ef1d0314e91be6f851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
+                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a0a8244e76d0a21691dcc8bae921093237ca58123db6a8d05304b6edb2fc13d6f5886c8308756b6b1d02f851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
                 "transactions" : [
                     {
                         "data" : "0x6000f1",
@@ -125,46 +135,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ef577e2bda2b21fa50506987851c65cf3e9c1df8f82591247a58dabadf9f6d3e",
+        "lastblockhash" : "0x70ece123f6df0a9458449d1137a2b69d66aa52b848cbc87399647f8798d666cf",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0bb8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0124f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -172,27 +182,32 @@
         }
     },
     "StackUnderFlowContractCreation_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011940",
-                    "hash" : "9e687a781f91f5dc039db9c55aa4eed76d552b01dab69454efd95c9cc1f2d384",
-                    "mixHash" : "49acfe773c6be154f43058c86c9cc5419c218cd218b8af8379d0f4d701eb484a",
-                    "nonce" : "ea5a937392343d45",
+                    "hash" : "0x516ddb3b12a7721bff433a3855ea08de39a5430b5794d83c27e0e15ad050262b",
+                    "mixHash" : "0xe512187b1ea9aad37e94ce97dd87610eb2341f242e8cf56d0ef158c8e4f5a692",
+                    "nonce" : "0x59284ffed2197b8e",
                     "number" : "0x01",
-                    "parentHash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-                    "receiptTrie" : "5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
-                    "stateRoot" : "453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
+                    "parentHash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+                    "receiptTrie" : "0x5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
+                    "stateRoot" : "0x453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a049acfe773c6be154f43058c86c9cc5419c218cd218b8af8379d0f4d701eb484a88ea5a937392343d45f851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
+                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a0e512187b1ea9aad37e94ce97dd87610eb2341f242e8cf56d0ef158c8e4f5a6928859284ffed2197b8ef851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
                 "transactions" : [
                     {
                         "data" : "0x6000f1",
@@ -211,46 +226,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9e687a781f91f5dc039db9c55aa4eed76d552b01dab69454efd95c9cc1f2d384",
+        "lastblockhash" : "0x516ddb3b12a7721bff433a3855ea08de39a5430b5794d83c27e0e15ad050262b",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0bb8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0124f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,27 +273,32 @@
         }
     },
     "StackUnderFlowContractCreation_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011940",
-                    "hash" : "6fe1f25a2f79686927668235c0559fb515e4a18d00a45c9037199c162b3dc072",
-                    "mixHash" : "c8dfcd1ec76181719e7548cb46b0f3639b4962383318132915a4be3992877209",
-                    "nonce" : "7b415938da2472b3",
+                    "hash" : "0x9b9db0e3848b11d9dfcfab5083b10d38da5d1d83024ce4f2588c0506860c6b13",
+                    "mixHash" : "0x36e3ec01d4ff1ca8b2f79a48daa707f5a96fac9a6155babf38de42f6d8169ad6",
+                    "nonce" : "0x1eeb43151e05596b",
                     "number" : "0x01",
-                    "parentHash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-                    "receiptTrie" : "5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
-                    "stateRoot" : "453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
+                    "parentHash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+                    "receiptTrie" : "0x5177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61",
+                    "stateRoot" : "0x453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a0c8dfcd1ec76181719e7548cb46b0f3639b4962383318132915a4be3992877209887b415938da2472b3f851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
+                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0453bda42d7ca55e11f254a3289914d8027cb980afa6d07d3796562dc9de77a54a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a05177c7ee3fb2c30972b7ac9b75e42599dee885aeaf4de3d804df50c362099f61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a036e3ec01d4ff1ca8b2f79a48daa707f5a96fac9a6155babf38de42f6d8169ad6881eeb43151e05596bf851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
                 "transactions" : [
                     {
                         "data" : "0x6000f1",
@@ -297,46 +317,144 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6fe1f25a2f79686927668235c0559fb515e4a18d00a45c9037199c162b3dc072",
+        "lastblockhash" : "0x9b9db0e3848b11d9dfcfab5083b10d38da5d1d83024ce4f2588c0506860c6b13",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51940",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0bb8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0124f8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "StackUnderFlowContractCreation_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/StackUnderFlowContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x011940",
+                    "hash" : "0x411d7246e6c7860fd5f500e271363200dfd9e89b2be268a70c650cfae4d4923e",
+                    "mixHash" : "0xc0d4610158b5da66fe7f1be2d62412a715b6de636f3b35652047bb80b4b2a394",
+                    "nonce" : "0xda005b6c50837fad",
+                    "number" : "0x01",
+                    "parentHash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+                    "receiptTrie" : "0x4652c89054f4617f8d8f15d62e8abf0930210e90d52cd7c74e46027467ed5e15",
+                    "stateRoot" : "0x904c41915d42abc740bf49cc64fd1d069622dfefebb507710a0fbe6928fd2b75",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9024ff901f8a0d580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0904c41915d42abc740bf49cc64fd1d069622dfefebb507710a0fbe6928fd2b75a048f9ec4c3408887a484bc0a55493efe00cf97b9abc1dc2e2b31f79ffa82027d4a04652c89054f4617f8d8f15d62e8abf0930210e90d52cd7c74e46027467ed5e15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830119408203e880a0c0d4610158b5da66fe7f1be2d62412a715b6de636f3b35652047bb80b4b2a39488da005b6c50837fadf851f84f8001830119408080836000f11ba05783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261aa0046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000f1",
+                        "gasLimit" : "0x011940",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5783623f46c011d42b9a4095a8f6383b245518bde6e47cc97fc5a88b8850261a",
+                        "s" : "0x046fbf81eeeea5b1e794cb094d277f639422b901c0d6d463797781d93396f969",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xd580d7c26a5506b39d368b2362bc7385265f35ff8674c97f77eb0632ebf421e6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0b58f2e7c218d617073b58de7676d5bd2678813a8e473d7c318bd601a967f98a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x411d7246e6c7860fd5f500e271363200dfd9e89b2be268a70c650cfae4d4923e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0bb8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0124f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0.json
index 52efd88c5..a2396678f 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "TransactionCreateAutoSuicideContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd6d8",
-                    "hash" : "3abdf80001fd151e04c6599698deee043226d4c9ceebc2d6f165c050ba7bfe0a",
-                    "mixHash" : "cb7a018565c31c76845f401bb3fb08be5dcf029d94570f48bf9b0ee3dfc5ea3e",
-                    "nonce" : "39d926fb197ac4ff",
+                    "hash" : "0x7eb65cfc75f213c8c2a8201947691be73d5c5e71f1100738fe5ae6d66c17ca90",
+                    "mixHash" : "0x337635ec8ef86581c233eef1b8830575d79231c68c7b7bdd7c500cc64cf12298",
+                    "nonce" : "0x628b500b9c02077f",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
-                    "stateRoot" : "4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
+                    "stateRoot" : "0x4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0cb7a018565c31c76845f401bb3fb08be5dcf029d94570f48bf9b0ee3dfc5ea3e8839d926fb197ac4fff864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0337635ec8ef86581c233eef1b8830575d79231c68c7b7bdd7c500cc64cf1229888628b500b9c02077ff864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000fff2ffff600160008035811a81",
@@ -39,46 +44,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3abdf80001fd151e04c6599698deee043226d4c9ceebc2d6f165c050ba7bfe0a",
+        "lastblockhash" : "0x7eb65cfc75f213c8c2a8201947691be73d5c5e71f1100738fe5ae6d66c17ca90",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d6d8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xafc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,27 +91,32 @@
         }
     },
     "TransactionCreateAutoSuicideContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd6d8",
-                    "hash" : "94f42e2613d3a59a29914e6e8e990cb8a6b28ec5382475e44970ce508846777e",
-                    "mixHash" : "b65a44f19cc237d1b8c4e0ef81c0d3f5b386b54f6f2dad4881f1e7617322b3a1",
-                    "nonce" : "493bad953f2bdb77",
+                    "hash" : "0x5a36e4f95ed330b29bced4ef674260df8e4f809bf031d1295a3c209513be189f",
+                    "mixHash" : "0xa9f613267c09dfae722e88f1bbc851b12806d69b2a4d5bed95480b54a6873e59",
+                    "nonce" : "0x505eb05616976966",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
-                    "stateRoot" : "4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
+                    "stateRoot" : "0x4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0b65a44f19cc237d1b8c4e0ef81c0d3f5b386b54f6f2dad4881f1e7617322b3a188493bad953f2bdb77f864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0a9f613267c09dfae722e88f1bbc851b12806d69b2a4d5bed95480b54a6873e5988505eb05616976966f864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000fff2ffff600160008035811a81",
@@ -125,46 +135,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "94f42e2613d3a59a29914e6e8e990cb8a6b28ec5382475e44970ce508846777e",
+        "lastblockhash" : "0x5a36e4f95ed330b29bced4ef674260df8e4f809bf031d1295a3c209513be189f",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d6d8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xafc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -172,27 +182,32 @@
         }
     },
     "TransactionCreateAutoSuicideContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x2bbe",
-                    "hash" : "94fb3949238829f0ca0c0d68ea449a755896d7002d36cc977c164292b7709b5d",
-                    "mixHash" : "437f478659c64320521590e7c38653171dcf9322fd04e435f2eb9382541f6960",
-                    "nonce" : "80a91b0afdb8590e",
+                    "hash" : "0xb1f94a3b04a029f25344a9e186dc2d87dfc57e25f3610bed074d2bc1044d64cc",
+                    "mixHash" : "0x2e596771654fae68476305ec6c26ed40f253a554c6929ba767064bcae8704331",
+                    "nonce" : "0x539804450601b87c",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "fbca33d61cf1c279a69422b51ab34281cb550a8ebde8bcd918df3ee0c79151cb",
-                    "stateRoot" : "005692ea401bc60ac6be1e1d755104f8ab4aeb91e4f04bd5a37dd551b17d27d7",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xfbca33d61cf1c279a69422b51ab34281cb550a8ebde8bcd918df3ee0c79151cb",
+                    "stateRoot" : "0x005692ea401bc60ac6be1e1d755104f8ab4aeb91e4f04bd5a37dd551b17d27d7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0005692ea401bc60ac6be1e1d755104f8ab4aeb91e4f04bd5a37dd551b17d27d7a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da0fbca33d61cf1c279a69422b51ab34281cb550a8ebde8bcd918df3ee0c79151cbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822bbe8203e880a0437f478659c64320521590e7c38653171dcf9322fd04e435f2eb9382541f69608880a91b0afdb8590ef864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0005692ea401bc60ac6be1e1d755104f8ab4aeb91e4f04bd5a37dd551b17d27d7a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da0fbca33d61cf1c279a69422b51ab34281cb550a8ebde8bcd918df3ee0c79151cbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822bbe8203e880a02e596771654fae68476305ec6c26ed40f253a554c6929ba767064bcae870433188539804450601b87cf864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000fff2ffff600160008035811a81",
@@ -211,53 +226,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "94fb3949238829f0ca0c0d68ea449a755896d7002d36cc977c164292b7709b5d",
+        "lastblockhash" : "0xb1f94a3b04a029f25344a9e186dc2d87dfc57e25f3610bed074d2bc1044d64cc",
         "network" : "Frontier",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42bbe",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x015ad3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -265,27 +280,32 @@
         }
     },
     "TransactionCreateAutoSuicideContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x76bc",
-                    "hash" : "2daee412e984c3422e252625bbafa5ce3c394bf9b890dcde17d74de9d51a3431",
-                    "mixHash" : "1e21acc8c80a091472ef0ba6f973dd113e8e9e358b0841c5ea3720e3412ac268",
-                    "nonce" : "23d4b9e538027577",
+                    "hash" : "0x3693dbae4e44e26931adf275b9ffb4dbd799e28adadfc2f54fd86a5e454904df",
+                    "mixHash" : "0xa9b94610595a6a56238994b5f655263afa7b1fc97bd4216bf737057bd07a72fe",
+                    "nonce" : "0xbdfdfef42cafde9b",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "3f9957d4066ff624873cfa89bf93a4ee8292d52504dc625edb71f89d4d32a7ea",
-                    "stateRoot" : "b6919873c9194938fddc674c31f426859e98491238e92e451e4088dd9267f19a",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x3f9957d4066ff624873cfa89bf93a4ee8292d52504dc625edb71f89d4d32a7ea",
+                    "stateRoot" : "0xb6919873c9194938fddc674c31f426859e98491238e92e451e4088dd9267f19a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6919873c9194938fddc674c31f426859e98491238e92e451e4088dd9267f19aa000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da03f9957d4066ff624873cfa89bf93a4ee8292d52504dc625edb71f89d4d32a7eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408276bc8203e880a01e21acc8c80a091472ef0ba6f973dd113e8e9e358b0841c5ea3720e3412ac2688823d4b9e538027577f864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6919873c9194938fddc674c31f426859e98491238e92e451e4088dd9267f19aa000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da03f9957d4066ff624873cfa89bf93a4ee8292d52504dc625edb71f89d4d32a7eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408276bc8203e880a0a9b94610595a6a56238994b5f655263afa7b1fc97bd4216bf737057bd07a72fe88bdfdfef42cafde9bf864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000fff2ffff600160008035811a81",
@@ -304,53 +324,151 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2daee412e984c3422e252625bbafa5ce3c394bf9b890dcde17d74de9d51a3431",
+        "lastblockhash" : "0x3693dbae4e44e26931adf275b9ffb4dbd799e28adadfc2f54fd86a5e454904df",
         "network" : "Homestead",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f476bc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x010fd5",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TransactionCreateAutoSuicideContract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateAutoSuicideContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xd6d8",
+                    "hash" : "0x33a56fde1d8030013290be14912b11a55ff0e6fe9e9b4d856ec77a1c6628c210",
+                    "mixHash" : "0x7f94967a252ddd6142227f52b4fafd98135a41a005827a936ae1ecacd37ab878",
+                    "nonce" : "0x1d7e669198fec5a9",
+                    "number" : "0x01",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xb243137394e58a80308b9d4a47f7c6186dc2bb5619f108404e51a55f6e15cfd3",
+                    "stateRoot" : "0xd92b015944a7f542aa5e104c0a97cd724a1d0d7220d9e3cea5b0ec58a35a5d24",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x00ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d92b015944a7f542aa5e104c0a97cd724a1d0d7220d9e3cea5b0ec58a35a5d24a000ab3d9f2d83e228edb6b16982f447c62a2142276e38525a112638e20d4e6b2da0b243137394e58a80308b9d4a47f7c6186dc2bb5619f108404e51a55f6e15cfd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a07f94967a252ddd6142227f52b4fafd98135a41a005827a936ae1ecacd37ab878881d7e669198fec5a9f864f862800182d6d8800f97600a80600c6000396000fff2ffff600160008035811a811ca0413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cada024fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x600a80600c6000396000fff2ffff600160008035811a81",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x413f5ee4083496d95e6ff1f802d040abeebff9d8554f55efef6c8eaa069a5cad",
+                        "s" : "0x24fbceb28bf499e9476cd47e1520a69c58a8e525d075f3d936348e2e52d1d5a1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x0f"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x33a56fde1d8030013290be14912b11a55ff0e6fe9e9b4d856ec77a1c6628c210",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d6d8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xafc8",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0.json
index 20998bb65..2ae8c5413 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "TransactionCreateRandomInitCode_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xfc57",
-                    "hash" : "356e438aab129cc19af5bc4987b91502d2c11c6efbb723ebf914357978b77709",
-                    "mixHash" : "0d7f5b243dfa1818c440e7c896b188d16fc0a131b9ef6a35ee0413faefaec9c2",
-                    "nonce" : "fcc4bafb842d3965",
+                    "hash" : "0x331cf33bdb897bb70aeb0384f4d1b05f6a056a8c75d497798e6ef23f06c2d9fa",
+                    "mixHash" : "0x28d0b205aed4994ebcc5c324317f94a521d5991c88731d7381f56f42dbc3902b",
+                    "nonce" : "0x86124fa208727bdb",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
-                    "stateRoot" : "3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xfb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
+                    "stateRoot" : "0x3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a00d7f5b243dfa1818c440e7c896b188d16fc0a131b9ef6a35ee0413faefaec9c288fcc4bafb842d3965f863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a028d0b205aed4994ebcc5c324317f94a521d5991c88731d7381f56f42dbc3902b8886124fa208727bdbf863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200600160008035811a8100",
@@ -39,46 +44,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "356e438aab129cc19af5bc4987b91502d2c11c6efbb723ebf914357978b77709",
+        "lastblockhash" : "0x331cf33bdb897bb70aeb0384f4d1b05f6a056a8c75d497798e6ef23f06c2d9fa",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4fc57",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x8a49",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,27 +91,32 @@
         }
     },
     "TransactionCreateRandomInitCode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xfc57",
-                    "hash" : "62f7171c6a937adc337e936f5fa813ef69ad5e8f5dbf823840f3cd269cd63aa7",
-                    "mixHash" : "e86e14f3d5f94cdb19abebbd700cb150549b64be7032f6997496e764aa0dae50",
-                    "nonce" : "aaae61dae32389ed",
+                    "hash" : "0xf38b7f92002997aa8f30f530f04da4c171f0a836d1975d35aed5d91d2df5e69a",
+                    "mixHash" : "0x06dd61a397daf14ed148f877d86381299b8406631aeb0b69786af6b46f797017",
+                    "nonce" : "0x0f4489940503ae12",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
-                    "stateRoot" : "3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xfb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
+                    "stateRoot" : "0x3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a0e86e14f3d5f94cdb19abebbd700cb150549b64be7032f6997496e764aa0dae5088aaae61dae32389edf863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a006dd61a397daf14ed148f877d86381299b8406631aeb0b69786af6b46f797017880f4489940503ae12f863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200600160008035811a8100",
@@ -125,46 +135,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "62f7171c6a937adc337e936f5fa813ef69ad5e8f5dbf823840f3cd269cd63aa7",
+        "lastblockhash" : "0xf38b7f92002997aa8f30f530f04da4c171f0a836d1975d35aed5d91d2df5e69a",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4fc57",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x8a49",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -172,27 +182,32 @@
         }
     },
     "TransactionCreateRandomInitCode_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xfc57",
-                    "hash" : "1d1490de7beff238f3a60d9be39e592bf7af0a0b655c2d72f9c8644f3469d020",
-                    "mixHash" : "f00634bab602121d9a33c28b2edc32fda272fcf390fc4f626b3c8e44b158c023",
-                    "nonce" : "9ae7555a4952a5ec",
+                    "hash" : "0x2b8bd1e395cbf2146666739f7fb7bffb48c297199ed8e935516012eab4ab58c1",
+                    "mixHash" : "0x527eac52a896a6080589cd112029eef79cb4d6f6a1a5591cd576370e087aea2c",
+                    "nonce" : "0xd1933f17a3e729ac",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
-                    "stateRoot" : "3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xfb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
+                    "stateRoot" : "0x3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a0f00634bab602121d9a33c28b2edc32fda272fcf390fc4f626b3c8e44b158c023889ae7555a4952a5ecf863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a0527eac52a896a6080589cd112029eef79cb4d6f6a1a5591cd576370e087aea2c88d1933f17a3e729acf863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200600160008035811a8100",
@@ -211,46 +226,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1d1490de7beff238f3a60d9be39e592bf7af0a0b655c2d72f9c8644f3469d020",
+        "lastblockhash" : "0x2b8bd1e395cbf2146666739f7fb7bffb48c297199ed8e935516012eab4ab58c1",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4fc57",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x8a49",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,27 +273,32 @@
         }
     },
     "TransactionCreateRandomInitCode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xfc57",
-                    "hash" : "bcc571b83bd1b0c52190561d029748927004cd497040f2a26b348ead39f868b1",
-                    "mixHash" : "89f642f55d043b74658224f6d9f93187b0b5c6650ddb52dc0a69bd551a4d6362",
-                    "nonce" : "3c7138b9c6aee0c7",
+                    "hash" : "0x97e06ef76d18ce4f5054fcf502f609c295d484af77e3e42c60232641a00ad66c",
+                    "mixHash" : "0x980254a31a8c463d6d0542386c126884eb5adca4d499cc86a7eaa9a0e3b3a082",
+                    "nonce" : "0xaa066cc3c16fa65f",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
-                    "stateRoot" : "3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xfb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85",
+                    "stateRoot" : "0x3cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a089f642f55d043b74658224f6d9f93187b0b5c6650ddb52dc0a69bd551a4d6362883c7138b9c6aee0c7f863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cbb27f5add2783f7eee771303a35185d013616531c4f17bd4aab68c22c94d82a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a0fb8b3e3c25cb9a850fa3fcd35ffd9d4d87f3a986749cbdfe20cbd6ca550a2c85b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a0980254a31a8c463d6d0542386c126884eb5adca4d499cc86a7eaa9a0e3b3a08288aa066cc3c16fa65ff863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200600160008035811a8100",
@@ -297,46 +317,144 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bcc571b83bd1b0c52190561d029748927004cd497040f2a26b348ead39f868b1",
+        "lastblockhash" : "0x97e06ef76d18ce4f5054fcf502f609c295d484af77e3e42c60232641a00ad66c",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4fc57",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x8a49",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TransactionCreateRandomInitCode_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateRandomInitCode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xfc57",
+                    "hash" : "0xe9abf2fee84fb049fe2eda7f5c522480fa9f33b89466c0d8dc6e23645da92f40",
+                    "mixHash" : "0xd1bb69452a6f850acf94c5a034fc87d095b50e33761d8a9200a4f112bb9f5182",
+                    "nonce" : "0x2738e9824317c88f",
+                    "number" : "0x01",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x7277650321c3a7ed66b4fa574acf924b6f11a7fbe8681af2d5f547dc500951b3",
+                    "stateRoot" : "0xe69007a4d79ae2d4ba8813345d70fc1f8f068b2c0444f743ced3db46976795b6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e69007a4d79ae2d4ba8813345d70fc1f8f068b2c0444f743ced3db46976795b6a09c39cc1a9e9fa5cfb76019dfa022778f15c162ec9235d94b692efc2d68759c63a07277650321c3a7ed66b4fa574acf924b6f11a7fbe8681af2d5f547dc500951b3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082fc578203e880a0d1bb69452a6f850acf94c5a034fc87d095b50e33761d8a9200a4f112bb9f5182882738e9824317c88ff863f861800182fc57800196600a80600c6000396000f200600160008035811a81001ba0e1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7aa00246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306c0",
+                "transactions" : [
+                    {
+                        "data" : "0x600a80600c6000396000f200600160008035811a8100",
+                        "gasLimit" : "0xfc57",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1c04107984a2068c41d9bc4088446fdcca26d45a4c0fcb0859adc0412e36b7a",
+                        "s" : "0x0246fc02ccb9f4a0afbd06bc62a4d357c7c96f98f5f22d453e66229803d91306",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe9abf2fee84fb049fe2eda7f5c522480fa9f33b89466c0d8dc6e23645da92f40",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4fc57",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x8a49",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0.json
index 53341d9f1..671211e15 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "TransactionCreateStopInInitcode_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd3bc",
-                    "hash" : "37b8aacdb0d0f4ab8abc1faee2cd520f529f85680a7a9a3d78587984ff4f2f4b",
-                    "mixHash" : "4c9d78528bfa30801579c4711eff9d4f588e7635d9fa83c3f035e5123640316c",
-                    "nonce" : "35efc586bff735b3",
+                    "hash" : "0x6163dc5d447a3016acbe3d156bf495bdb6dcfb10a337707357a5d8da3c11928d",
+                    "mixHash" : "0x8fb4041fb2c86204a892bb68ff472697bd199e2d5635fbe3a4fdaad9c2a27081",
+                    "nonce" : "0x4c7ea921cf313203",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "b0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27",
-                    "stateRoot" : "543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89b",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xb0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27",
+                    "stateRoot" : "0x543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89ba0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa0b0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a04c9d78528bfa30801579c4711eff9d4f588e7635d9fa83c3f035e5123640316c8835efc586bff735b3f864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89ba0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa0b0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a08fb4041fb2c86204a892bb68ff472697bd199e2d5635fbe3a4fdaad9c2a27081884c7ea921cf313203f864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c600039600000f20000600160008035811a81",
@@ -39,53 +44,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "37b8aacdb0d0f4ab8abc1faee2cd520f529f85680a7a9a3d78587984ff4f2f4b",
+        "lastblockhash" : "0x6163dc5d447a3016acbe3d156bf495bdb6dcfb10a337707357a5d8da3c11928d",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d3bc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xb2e3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -93,27 +98,32 @@
         }
     },
     "TransactionCreateStopInInitcode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd3bc",
-                    "hash" : "20c5a36092253f2f9ac6f245b249dc400d2fc2ea49521996b770a25a3151ec8e",
-                    "mixHash" : "2bd5c5ae25df775c5a0bdf5d996d912d630a2d918e0ac382866553aec48f7d9e",
-                    "nonce" : "3bc320de555892ed",
+                    "hash" : "0x7f6a3c91984d4746ee3dceea2d9e2eb03ce4a3d7e9e3aef62cb4579a1993bc83",
+                    "mixHash" : "0xb98b69cffd7926cac726139db22022389a18efdabdc794e4e39d5317d0b4d090",
+                    "nonce" : "0x109d276c5034de2b",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "8282903bf1e6fe27234908e4dc6ef1d36a4fb9bab3de4be9c3c46f975d670f56",
-                    "stateRoot" : "6295735b5d815b4880811f9f9aff60f754b9d5db9901d857909b7103fb080424",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x8282903bf1e6fe27234908e4dc6ef1d36a4fb9bab3de4be9c3c46f975d670f56",
+                    "stateRoot" : "0x6295735b5d815b4880811f9f9aff60f754b9d5db9901d857909b7103fb080424",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06295735b5d815b4880811f9f9aff60f754b9d5db9901d857909b7103fb080424a0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa08282903bf1e6fe27234908e4dc6ef1d36a4fb9bab3de4be9c3c46f975d670f56b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a02bd5c5ae25df775c5a0bdf5d996d912d630a2d918e0ac382866553aec48f7d9e883bc320de555892edf864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06295735b5d815b4880811f9f9aff60f754b9d5db9901d857909b7103fb080424a0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa08282903bf1e6fe27234908e4dc6ef1d36a4fb9bab3de4be9c3c46f975d670f56b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a0b98b69cffd7926cac726139db22022389a18efdabdc794e4e39d5317d0b4d09088109d276c5034de2bf864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c600039600000f20000600160008035811a81",
@@ -132,53 +142,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "20c5a36092253f2f9ac6f245b249dc400d2fc2ea49521996b770a25a3151ec8e",
+        "lastblockhash" : "0x7f6a3c91984d4746ee3dceea2d9e2eb03ce4a3d7e9e3aef62cb4579a1993bc83",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d3bc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xb2e3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -186,27 +196,32 @@
         }
     },
     "TransactionCreateStopInInitcode_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x56bc",
-                    "hash" : "1dc21492ca20702e4891f6582cd1399f88222c7b0b6272398f43f42fb6a42786",
-                    "mixHash" : "61489f47a657f6748a56dbcf370fcbf671f7c63607777b7b50b38b3af0ceccdb",
-                    "nonce" : "73cf071a8de2ec0a",
+                    "hash" : "0x01828210e50c06cf4c23c094a8129f3f50ea74ecd92db961b78b1ff2caa4553b",
+                    "mixHash" : "0x77b7be6dcaca3057b3713e36508e57ae2318a2a918152ef493979d920fc27468",
+                    "nonce" : "0x56f2fde7fe0f489c",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4b6a67831b50ee0d8064aa251bb9c8d5dea77aee0815afe239d2c474f6280744",
-                    "stateRoot" : "b73319d79393591b83e5bfd45018455be0993b17a557074767f9b0752b48b4ff",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4b6a67831b50ee0d8064aa251bb9c8d5dea77aee0815afe239d2c474f6280744",
+                    "stateRoot" : "0xb73319d79393591b83e5bfd45018455be0993b17a557074767f9b0752b48b4ff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b73319d79393591b83e5bfd45018455be0993b17a557074767f9b0752b48b4ffa0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa04b6a67831b50ee0d8064aa251bb9c8d5dea77aee0815afe239d2c474f6280744b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408256bc8203e880a061489f47a657f6748a56dbcf370fcbf671f7c63607777b7b50b38b3af0ceccdb8873cf071a8de2ec0af864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b73319d79393591b83e5bfd45018455be0993b17a557074767f9b0752b48b4ffa0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa04b6a67831b50ee0d8064aa251bb9c8d5dea77aee0815afe239d2c474f6280744b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408256bc8203e880a077b7be6dcaca3057b3713e36508e57ae2318a2a918152ef493979d920fc274688856f2fde7fe0f489cf864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c600039600000f20000600160008035811a81",
@@ -225,53 +240,53 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1dc21492ca20702e4891f6582cd1399f88222c7b0b6272398f43f42fb6a42786",
+        "lastblockhash" : "0x01828210e50c06cf4c23c094a8129f3f50ea74ecd92db961b78b1ff2caa4553b",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f456bc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x012fe3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -279,27 +294,32 @@
         }
     },
     "TransactionCreateStopInInitcode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd3bc",
-                    "hash" : "293115c82ef2e913a580197008a0fb5a7f01a06490e4d38d26f67334821dfbd2",
-                    "mixHash" : "703541ea5c817a21e48a744fbb11016f33fec45e317b9675af33a71e32488fea",
-                    "nonce" : "ce098b7d70814778",
+                    "hash" : "0xd87e99f85c3b88e1c37e97421dc1dffbaa554a709d718fcc43ffb833bb10ba3f",
+                    "mixHash" : "0x07820551bf1b39b723e03868b1f060d66921d1b2827e58a0ef4270bf99d0358a",
+                    "nonce" : "0x763e2f9acc8a4b7c",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "b0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27",
-                    "stateRoot" : "543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89b",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xb0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27",
+                    "stateRoot" : "0x543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89ba0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa0b0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a0703541ea5c817a21e48a744fbb11016f33fec45e317b9675af33a71e32488fea88ce098b7d70814778f864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0543020d5a0796ae3f270f6b2e3fc9d15d1ae6f3313feffa8a4fcdecd698dd89ba0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa0b0b2dbee56d4462b873d34b1edab09d5dbb75296592de2fcb064a9d24daa9f27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a007820551bf1b39b723e03868b1f060d66921d1b2827e58a0ef4270bf99d0358a88763e2f9acc8a4b7cf864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c600039600000f20000600160008035811a81",
@@ -318,53 +338,158 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "293115c82ef2e913a580197008a0fb5a7f01a06490e4d38d26f67334821dfbd2",
+        "lastblockhash" : "0xd87e99f85c3b88e1c37e97421dc1dffbaa554a709d718fcc43ffb833bb10ba3f",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d3bc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xb2e3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        }
+    },
+    "TransactionCreateStopInInitcode_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateStopInInitcode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xd3bc",
+                    "hash" : "0xe1c713e7454923737d0754ed9e39e49920e4e58825a0af41dbbf0371acb825e4",
+                    "mixHash" : "0xac128f834b7376cc352c0d53a1040feb9a10b61ad8398d63466825111f1ffc8c",
+                    "nonce" : "0x0f43576a349ffe99",
+                    "number" : "0x01",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xa033904d2d4ef9c17b3d03ee9a5d1f80da087fcfcf3b6c4d3ee9558becd305b4",
+                    "stateRoot" : "0x4b8b6d5ed5a20958fad63eddae1df2a20b90d8469566e17bc3c06e422a28d232",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b8b6d5ed5a20958fad63eddae1df2a20b90d8469566e17bc3c06e422a28d232a0783a1c47a24d380251b5e3b74c0ed04c7fba17359d5545209e87881ff322f42fa0a033904d2d4ef9c17b3d03ee9a5d1f80da087fcfcf3b6c4d3ee9558becd305b4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d3bc8203e880a0ac128f834b7376cc352c0d53a1040feb9a10b61ad8398d63466825111f1ffc8c880f43576a349ffe99f864f862800182d6d8800197600a80600c600039600000f20000600160008035811a811ca0322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254a06164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x600a80600c600039600000f20000600160008035811a81",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x322f8bd19f8ff29928f53409bca49b9631fe1e41113bc895f3b1c9ade5367254",
+                        "s" : "0x6164a2e2f25f2ccd201f8167e9a7babeeac2304104a039678e4dd0ca1588a38e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe1c713e7454923737d0754ed9e39e49920e4e58825a0af41dbbf0371acb825e4",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d3bc",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xb2e3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0.json
index 518e1ece8..6fd12db5d 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "TransactionCreateSuicideInInitcode_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd6d8",
-                    "hash" : "f5af3dc0791a006be509edd0a1512f8aa638c614420079ca68d4ef93cbcd71c8",
-                    "mixHash" : "c9f353dc475b4236a2fb143a86a93ba56de09a3821a8021b5a220f8dd86b0f8b",
-                    "nonce" : "8245ed2ad53eaf7f",
+                    "hash" : "0x960098fc02095721563708f6f065c714a46c4100e2d667dfe35c0ff79f5bece2",
+                    "mixHash" : "0xfa31ef1550d5dac124fbc968b686926d4cf06589f386627661fd09e20b295d77",
+                    "nonce" : "0x14b7183d1b89f2e3",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
-                    "stateRoot" : "4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
+                    "stateRoot" : "0x4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0c9f353dc475b4236a2fb143a86a93ba56de09a3821a8021b5a220f8dd86b0f8b888245ed2ad53eaf7ff863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0fa31ef1550d5dac124fbc968b686926d4cf06589f386627661fd09e20b295d778814b7183d1b89f2e3f863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200ff600160008035811a81",
@@ -39,46 +44,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f5af3dc0791a006be509edd0a1512f8aa638c614420079ca68d4ef93cbcd71c8",
+        "lastblockhash" : "0x960098fc02095721563708f6f065c714a46c4100e2d667dfe35c0ff79f5bece2",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d6d8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xafc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -86,27 +91,32 @@
         }
     },
     "TransactionCreateSuicideInInitcode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd6d8",
-                    "hash" : "fee113170dacfc29f0dcbe559c2b076ea831dacc5ef801d4e7d1b17709096b32",
-                    "mixHash" : "cb9aa1cb395681c4c6367084c8e697023711e33c2112a11073900ca23dc72c78",
-                    "nonce" : "ba4e4ceb6362522c",
+                    "hash" : "0x7793a51e11b0fa0f95134b34c70eb85e94d2d9518d16463e0c3773a4a08f4138",
+                    "mixHash" : "0xf7fe736ebf73b46b77045a08907aa751ce4d33c4a76b2290345daec7336d0f2d",
+                    "nonce" : "0xd8ecc9141ed53d17",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
-                    "stateRoot" : "4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
+                    "stateRoot" : "0x4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0cb9aa1cb395681c4c6367084c8e697023711e33c2112a11073900ca23dc72c7888ba4e4ceb6362522cf863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0f7fe736ebf73b46b77045a08907aa751ce4d33c4a76b2290345daec7336d0f2d88d8ecc9141ed53d17f863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200ff600160008035811a81",
@@ -125,46 +135,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fee113170dacfc29f0dcbe559c2b076ea831dacc5ef801d4e7d1b17709096b32",
+        "lastblockhash" : "0x7793a51e11b0fa0f95134b34c70eb85e94d2d9518d16463e0c3773a4a08f4138",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d6d8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xafc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -172,27 +182,32 @@
         }
     },
     "TransactionCreateSuicideInInitcode_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd6d8",
-                    "hash" : "c5fc1452889b000dcd878dddc20df4fc43ae4666bab54e14b483b75391b13951",
-                    "mixHash" : "290dadb637ce8f11419f688fdd835b1c2ce0f15fae435445e9afc821c70e1c4a",
-                    "nonce" : "3511477fc40285c8",
+                    "hash" : "0x427eb5d1a7cb7da15405a624f4ad5fbee7f71fb0773149671d5b2e33ad8a1dba",
+                    "mixHash" : "0x744f7b4b27c285f1a8c72973c431e55bd226c231a406e55a9b113130f918be36",
+                    "nonce" : "0xfec7d07a93543f44",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
-                    "stateRoot" : "4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
+                    "stateRoot" : "0x4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0290dadb637ce8f11419f688fdd835b1c2ce0f15fae435445e9afc821c70e1c4a883511477fc40285c8f863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0744f7b4b27c285f1a8c72973c431e55bd226c231a406e55a9b113130f918be3688fec7d07a93543f44f863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200ff600160008035811a81",
@@ -211,46 +226,46 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c5fc1452889b000dcd878dddc20df4fc43ae4666bab54e14b483b75391b13951",
+        "lastblockhash" : "0x427eb5d1a7cb7da15405a624f4ad5fbee7f71fb0773149671d5b2e33ad8a1dba",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d6d8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xafc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -258,27 +273,32 @@
         }
     },
     "TransactionCreateSuicideInInitcode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xd6d8",
-                    "hash" : "a6921e24ca4a49e9a0d79ffd50739703eed2801832e1d147d9dde6042a691775",
-                    "mixHash" : "5528ae50bc97c01d23ce7709b5e76edada093cc05bceb01976d178ee70bebcd8",
-                    "nonce" : "5f1081d4ffc74549",
+                    "hash" : "0x5ce28c2638cc414a71c72d10c36981ac2d0e4ac32176eb6168aabe754641a6fb",
+                    "mixHash" : "0x044e3d4e299a553c225af6745bbefde3985fc4365a9b2b0380c41bee44f2bc17",
+                    "nonce" : "0xcc669767b190277f",
                     "number" : "0x01",
-                    "parentHash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
-                    "stateRoot" : "4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0x4fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdf",
+                    "stateRoot" : "0x4e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a05528ae50bc97c01d23ce7709b5e76edada093cc05bceb01976d178ee70bebcd8885f1081d4ffc74549f863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e8c8be5b52e58331131afd39c4c071b00251abe463aa0864abe7ad6c68388e4a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a04fedc4b110ac663de5ae7a1f687990d70074a39e2b7acb915c40138ab11e1fdfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a0044e3d4e299a553c225af6745bbefde3985fc4365a9b2b0380c41bee44f2bc1788cc669767b190277ff863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
                 "transactions" : [
                     {
                         "data" : "0x600a80600c6000396000f200ff600160008035811a81",
@@ -297,46 +317,144 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a6921e24ca4a49e9a0d79ffd50739703eed2801832e1d147d9dde6042a691775",
+        "lastblockhash" : "0x5ce28c2638cc414a71c72d10c36981ac2d0e4ac32176eb6168aabe754641a6fb",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d6d8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xafc8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TransactionCreateSuicideInInitcode_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/TransactionCreateSuicideInInitcode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xd6d8",
+                    "hash" : "0xb7ab0d429b14f9316b9dcb33b07605bd9cc06988e398ad8b1c5e1dcc8a06faf4",
+                    "mixHash" : "0x6020d95cad89ab9d1f96a3804b93cfff98624f247017584a630fb822e8e75ecd",
+                    "nonce" : "0xc432c3c51efc1d2b",
+                    "number" : "0x01",
+                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+                    "receiptTrie" : "0xb243137394e58a80308b9d4a47f7c6186dc2bb5619f108404e51a55f6e15cfd3",
+                    "stateRoot" : "0xd92b015944a7f542aa5e104c0a97cd724a1d0d7220d9e3cea5b0ec58a35a5d24",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d92b015944a7f542aa5e104c0a97cd724a1d0d7220d9e3cea5b0ec58a35a5d24a04bca6ae0565f681cedbf26ba5abf9e93636596433158f4f6a863534da1d87ae2a0b243137394e58a80308b9d4a47f7c6186dc2bb5619f108404e51a55f6e15cfd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d6d88203e880a06020d95cad89ab9d1f96a3804b93cfff98624f247017584a630fb822e8e75ecd88c432c3c51efc1d2bf863f861800182d6d8800196600a80600c6000396000f200ff600160008035811a811ca0c5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0a0444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aedec0",
+                "transactions" : [
+                    {
+                        "data" : "0x600a80600c6000396000f200ff600160008035811a81",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5bd65fa108c957564f4e5d3d62c2b7282a2981b031899a2fd897dd9843d32e0",
+                        "s" : "0x444bfcb5ab0f57048cf2cce5e2c33495e624b4b09e3c30391187d7fe7f70aede",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb7ab0d429b14f9316b9dcb33b07605bd9cc06988e398ad8b1c5e1dcc8a06faf4",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4d6d8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xafc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
author	Dimitry <winsvega@mail.ru>	2017-08-01 14:11:00 +0800
committer	Dimitry <winsvega@mail.ru>	2017-08-01 14:11:00 +0800
commit	f71c2688e1a839f8429f7e94ec5e56bb182d82cf (patch)
tree	e9ad8d0e49e5717880a5bef10c332711d047f5b3 /BlockchainTests/GeneralStateTests/stInitCodeTest
parent	092c0560e8084a05516430b8ed3a735290c969e1 (diff)
download	dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.gz dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.zst dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.zip