regenerate hive tests

46 files changed, 14960 insertions, 9179 deletions

diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
index 8b119319d..0b13d7176 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Call1024BalanceTooLow_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "ad67fbaf02ee26745a770cf8f898b4303987087629fec0fa5deee6df027f847b",
-                    "mixHash" : "989fa2c238f35005f0956f52f1c353350ad4d341f972f0a2cb7548d13467028a",
-                    "nonce" : "1083ea19fc30fa79",
+                    "hash" : "0x3ef7f90ef324da4af17f1babbad5b2714818f6de3b8200d3e8f5d7357f123a43",
+                    "mixHash" : "0x29246ae817bbf3e10c86589e37f61e01d0f86464e2761bf8fb3715713dea98bb",
+                    "nonce" : "0x098a5d20726b2f7a",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0989fa2c238f35005f0956f52f1c353350ad4d341f972f0a2cb7548d13467028a881083ea19fc30fa79f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a029246ae817bbf3e10c86589e37f61e01d0f86464e2761bf8fb3715713dea98bb88098a5d20726b2f7af865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ad67fbaf02ee26745a770cf8f898b4303987087629fec0fa5deee6df027f847b",
+        "lastblockhash" : "0x3ef7f90ef324da4af17f1babbad5b2714818f6de3b8200d3e8f5d7357f123a43",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182459fc5ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -92,21 +97,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -116,36 +121,41 @@
         }
     },
     "Call1024BalanceTooLow_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "f6698c67f5a7e2869148bd51e16598028fb972d82b3d69232ec2d13c8d29bf14",
-                    "mixHash" : "945b56b001df25243fe644921bfedc76afbe893101e891f6829e44d707119186",
-                    "nonce" : "662cf146eeabc75a",
+                    "hash" : "0x18e3a7edcaae8a0b5a5d77121f22a3c770c009aa14ae95c99bbb5aaf58316471",
+                    "mixHash" : "0x40f9f1ea0c7220d976fe09a58a9d857ac330baefabeb79619b4f4b449d44e588",
+                    "nonce" : "0x69bfea58b912b270",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0945b56b001df25243fe644921bfedc76afbe893101e891f6829e44d70711918688662cf146eeabc75af865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a040f9f1ea0c7220d976fe09a58a9d857ac330baefabeb79619b4f4b449d44e5888869bfea58b912b270f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -155,49 +165,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f6698c67f5a7e2869148bd51e16598028fb972d82b3d69232ec2d13c8d29bf14",
+        "lastblockhash" : "0x18e3a7edcaae8a0b5a5d77121f22a3c770c009aa14ae95c99bbb5aaf58316471",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182459fc5ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -208,21 +218,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -232,36 +242,41 @@
         }
     },
     "Call1024BalanceTooLow_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d788",
-                    "hash" : "ccca2e6356e7ddd8b8d0e2db55acc3046e0fbfc4880d2717a558a205b8050b63",
-                    "mixHash" : "c7c6b0e8e60fab9905ea68f27455386d2e25ccb48ad5d48c8c45a48b20a3ea44",
-                    "nonce" : "44675d7c658dca40",
+                    "hash" : "0xb147f27690e285eb0aa06644964efd777982f86f51ebe2d2e3dcc3c0a1e939e0",
+                    "mixHash" : "0xe1874e104764adf9c637ca6982bcbf83f26b2304894c2168ae9f7f16eb7dd48c",
+                    "nonce" : "0x38cdf6a6ab981a71",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
-                    "stateRoot" : "2ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
+                    "stateRoot" : "0x2ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a0c7c6b0e8e60fab9905ea68f27455386d2e25ccb48ad5d48c8c45a48b20a3ea448844675d7c658dca40f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a0e1874e104764adf9c637ca6982bcbf83f26b2304894c2168ae9f7f16eb7dd48c8838cdf6a6ab981a71f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -271,49 +286,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ccca2e6356e7ddd8b8d0e2db55acc3046e0fbfc4880d2717a558a205b8050b63",
+        "lastblockhash" : "0xb147f27690e285eb0aa06644964efd777982f86f51ebe2d2e3dcc3c0a1e939e0",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff2877",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563a18244f4d788",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -322,21 +337,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -346,36 +361,41 @@
         }
     },
     "Call1024BalanceTooLow_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "ff699d8dc95b65d40976cf5ba4180617bc7795907118e218dfa04c100941076a",
-                    "mixHash" : "adfacc5f3b533becd26a2f3c000fc0d525658654f94ffe642fadf1bd255b30bf",
-                    "nonce" : "2436290e5838e4ae",
+                    "hash" : "0x35c6d0a82c461a940f008fe5c27f6fa089487dad96e739740f3a3ac431754719",
+                    "mixHash" : "0xc73435d52a0c58f2dd619d1b2fe09dbc85ccd4349c9bb4597188f63ac050a790",
+                    "nonce" : "0xadee808296369124",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
-                    "stateRoot" : "8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
+                    "stateRoot" : "0x8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0adfacc5f3b533becd26a2f3c000fc0d525658654f94ffe642fadf1bd255b30bf882436290e5838e4aef865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0c73435d52a0c58f2dd619d1b2fe09dbc85ccd4349c9bb4597188f63ac050a79088adee808296369124f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -385,49 +405,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ff699d8dc95b65d40976cf5ba4180617bc7795907118e218dfa04c100941076a",
+        "lastblockhash" : "0x35c6d0a82c461a940f008fe5c27f6fa089487dad96e739740f3a3ac431754719",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff4bcb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563a18244f4b42a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -437,21 +457,149 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024BalanceTooLow_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xabc5ed",
+                    "hash" : "0x8077fac817114ff7d75b08f307bfb2175ad01527e632ab91abeb5b20bad44a86",
+                    "mixHash" : "0x3afc56b161245490850d97af45d40d4da29dbbd7c91bff0d65aa2eaab7083bd0",
+                    "nonce" : "0x32b775bb02c35a84",
+                    "number" : "0x01",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
+                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a03afc56b161245490850d97af45d40d4da29dbbd7c91bff0d65aa2eaab7083bd08832b775bb02c35a84f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x10000000d788",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
+                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8077fac817114ff7d75b08f307bfb2175ad01527e632ab91abeb5b20bad44a86",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffff543a08",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x45639182459fc5ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
index 56c1b2586..9f5af1544 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Call1024OOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0a61d988dbd5179741fd6aaf08f32fce51515418361d0ba52027fe0929c0b1ff",
-                    "mixHash" : "f37bd45e0b61ec0cc17730943b1d5cc5555247a115248052b8e2bd6ea5069b24",
-                    "nonce" : "92a72344d331600f",
+                    "hash" : "0xec2caf8e458716117b37771ce9aff25a532bf94606d10749744c6132bee459e9",
+                    "mixHash" : "0xe58ef12ef674b080552dbd150b5b2641bfc9ac552d393ce6e76dc8a3cafce552",
+                    "nonce" : "0x336993eaa053fe80",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0f37bd45e0b61ec0cc17730943b1d5cc5555247a115248052b8e2bd6ea5069b248892a72344d331600ff862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0e58ef12ef674b080552dbd150b5b2641bfc9ac552d393ce6e76dc8a3cafce55288336993eaa053fe80f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0a61d988dbd5179741fd6aaf08f32fce51515418361d0ba52027fe0929c0b1ff",
+        "lastblockhash" : "0xec2caf8e458716117b37771ce9aff25a532bf94606d10749744c6132bee459e9",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182452e8720",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -93,21 +98,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -117,36 +122,41 @@
         }
     },
     "Call1024OOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "19fdd5f4c0163d2dc56c0b1891b5dfbb000449e6bad59379f303b070a95a0abd",
-                    "mixHash" : "8b55229d9e0685fd39d77edf7527383f2da990cbcecabafba0da93e22bbe7e81",
-                    "nonce" : "a4652e42e06b6764",
+                    "hash" : "0x3a8939f7daf93e29e4c7b13fa9935763af7b56e50eec0ce39ae5db0169c90444",
+                    "mixHash" : "0x02479f1dceebcba82022c886945863c122339c69a10b01f3b8b3ee0eae4b05b9",
+                    "nonce" : "0x36ed9aad2d61efe8",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a08b55229d9e0685fd39d77edf7527383f2da990cbcecabafba0da93e22bbe7e8188a4652e42e06b6764f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a002479f1dceebcba82022c886945863c122339c69a10b01f3b8b3ee0eae4b05b98836ed9aad2d61efe8f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -156,49 +166,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "19fdd5f4c0163d2dc56c0b1891b5dfbb000449e6bad59379f303b070a95a0abd",
+        "lastblockhash" : "0x3a8939f7daf93e29e4c7b13fa9935763af7b56e50eec0ce39ae5db0169c90444",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182452e8720",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -210,21 +220,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -234,36 +244,41 @@
         }
     },
     "Call1024OOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe17a",
-                    "hash" : "a90bf314809d07b18dd6ec3856c36c66c32b2cee2eaefea2a90fdd50defaa7d5",
-                    "mixHash" : "7de67c015344789b0efa005e408f212ddbd91706100a36109650c9c75fcb4e69",
-                    "nonce" : "b5e93ab8c7ba8e37",
+                    "hash" : "0x77c1488570d049afb713c662c41f8ea725a5d174054f1d6e382b532fe3c41f59",
+                    "mixHash" : "0xd48f8016189872c867e1e7d920fcc86568081223120c19cd37a6f97c35405857",
+                    "nonce" : "0x85a8ebb4d22cfa19",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
-                    "stateRoot" : "f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
+                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a07de67c015344789b0efa005e408f212ddbd91706100a36109650c9c75fcb4e6988b5e93ab8c7ba8e37f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0d48f8016189872c867e1e7d920fcc86568081223120c19cd37a6f97c354058578885a8ebb4d22cfa19f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -273,49 +288,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a90bf314809d07b18dd6ec3856c36c66c32b2cee2eaefea2a90fdd50defaa7d5",
+        "lastblockhash" : "0x77c1488570d049afb713c662c41f8ea725a5d174054f1d6e382b532fe3c41f59",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff101e85",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918245e3e17a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -324,21 +339,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -348,36 +363,41 @@
         }
     },
     "Call1024OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "4c78b3b19ab417e0214af17090d35b9a1eb0a94c8e39e8c3501ef408e7e7a44b",
-                    "mixHash" : "c84ac07ad570208dc990877004b87835eb04071159defbee126a1ef35038bcea",
-                    "nonce" : "3e12a73ff98fac51",
+                    "hash" : "0xbff05e89ef5d03bfe466e0cabdbf3b52d5a87551bbd03bb37cafc7a939c20137",
+                    "mixHash" : "0x158535bc4e7f9b98f83f3e75863b8bfdbeb1d03ecf3d43423d401608e7548635",
+                    "nonce" : "0xe0f7de81f0331cdd",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
-                    "stateRoot" : "7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
+                    "stateRoot" : "0x7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0c84ac07ad570208dc990877004b87835eb04071159defbee126a1ef35038bcea883e12a73ff98fac51f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0158535bc4e7f9b98f83f3e75863b8bfdbeb1d03ecf3d43423d401608e754863588e0f7de81f0331cddf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -387,49 +407,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4c78b3b19ab417e0214af17090d35b9a1eb0a94c8e39e8c3501ef408e7e7a44b",
+        "lastblockhash" : "0xbff05e89ef5d03bfe466e0cabdbf3b52d5a87551bbd03bb37cafc7a939c20137",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff102a7f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918245e3d576",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -441,21 +461,150 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024OOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x3a8720",
+                    "hash" : "0xb28945329c0c37d1524914d311ccd471f9c1019ee8a3a7d955b2128bb71e7a58",
+                    "mixHash" : "0x426b2d840a6401c5533fe7a18d6ba678816e08280ffb69a4d4c5cef6d12460ee",
+                    "nonce" : "0xa7153442c8b06956",
+                    "number" : "0x01",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
+                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0426b2d840a6401c5533fe7a18d6ba678816e08280ffb69a4d4c5cef6d12460ee88a7153442c8b06956f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xefe17a",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
+                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb28945329c0c37d1524914d311ccd471f9c1019ee8a3a7d955b2128bb71e7a58",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffc578d5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x45639182452e8720",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x85",
+                    "0x01" : "0x01",
+                    "0x02" : "0x020789"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
index a09777c10..4dd7f2ff6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Call1024PreCalls_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "61cc47a503f2336a677eeb08a84f528556166d5c47c4fa3f77a2c7d8fff7a41e",
-                    "mixHash" : "ee001ee04e0ba83747d8a706100707fbbbe2ebff28ce8fd5e7e2aa4cd86860ba",
-                    "nonce" : "8d0ce942165708ae",
+                    "hash" : "0x15a5a6e5873c5b0c1530ee62d2040574306ba8afabb75c2ce7f550e35524e973",
+                    "mixHash" : "0x9b8c9696df473b0387a0239b3ea6d61b5acead7f6ccd801b82ecc553228e0b0e",
+                    "nonce" : "0x167440cc53d9d4c0",
                     "number" : "0x01",
-                    "parentHash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
-                    "stateRoot" : "722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
+                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
+                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0ee001ee04e0ba83747d8a706100707fbbbe2ebff28ce8fd5e7e2aa4cd86860ba888d0ce942165708aef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a09b8c9696df473b0387a0239b3ea6d61b5acead7f6ccd801b82ecc553228e0b0e88167440cc53d9d4c0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "61cc47a503f2336a677eeb08a84f528556166d5c47c4fa3f77a2c7d8fff7a41e",
+        "lastblockhash" : "0x15a5a6e5873c5b0c1530ee62d2040574306ba8afabb75c2ce7f550e35524e973",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2320",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182472179b7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2a",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -94,21 +99,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -118,36 +123,41 @@
         }
     },
     "Call1024PreCalls_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "8e89915bd163e115ef1beb483c24f5b2c8ac9cf0ef40c136ca3117702b13746b",
-                    "mixHash" : "56addddb622c25084db172995500947944ee23c03c7df6ca822c2cb45866fa1d",
-                    "nonce" : "ffe0f07fc0a7feab",
+                    "hash" : "0x9d012bc7182d19764663c30ccf0b8093ec0494d409bd96a1973359745d4daadb",
+                    "mixHash" : "0x2fce36ece9bea962e42dc12c8855f33013169b8a862af36e01b6fec4ebdb4bb9",
+                    "nonce" : "0x93b537e691a772da",
                     "number" : "0x01",
-                    "parentHash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
-                    "stateRoot" : "722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
+                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
+                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a056addddb622c25084db172995500947944ee23c03c7df6ca822c2cb45866fa1d88ffe0f07fc0a7feabf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a02fce36ece9bea962e42dc12c8855f33013169b8a862af36e01b6fec4ebdb4bb98893b537e691a772daf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -157,49 +167,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8e89915bd163e115ef1beb483c24f5b2c8ac9cf0ef40c136ca3117702b13746b",
+        "lastblockhash" : "0x9d012bc7182d19764663c30ccf0b8093ec0494d409bd96a1973359745d4daadb",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2320",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182472179b7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2a",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -212,21 +222,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -236,36 +246,41 @@
         }
     },
     "Call1024PreCalls_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "5a5a5022dcaaa312dd18ef6f370eaeabc8c023061062ac07a6e3e5fb26a5000d",
-                    "mixHash" : "6584d5ceed428555cdd0c71d259ea85d08409169fd0857bae0949fbc1847ec90",
-                    "nonce" : "2d2c90d99f4364ce",
+                    "hash" : "0x45b322cd666a00aeaa0d901f30e0cedc84109f4d2600534146a6a27bb3b790ad",
+                    "mixHash" : "0xe447eafd680abc79b5c3810644f2cfce71be76353b1555f3f78369c30df0b59b",
+                    "nonce" : "0xc8439f6ff8a8fdf4",
                     "number" : "0x01",
-                    "parentHash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
-                    "stateRoot" : "ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1",
+                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+                    "receiptTrie" : "0x1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
+                    "stateRoot" : "0xccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a06584d5ceed428555cdd0c71d259ea85d08409169fd0857bae0949fbc1847ec90882d2c90d99f4364cef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0e447eafd680abc79b5c3810644f2cfce71be76353b1555f3f78369c30df0b59b88c8439f6ff8a8fdf4f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -275,49 +290,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5a5a5022dcaaa312dd18ef6f370eaeabc8c023061062ac07a6e3e5fb26a5000d",
+        "lastblockhash" : "0x45b322cd666a00aeaa0d901f30e0cedc84109f4d2600534146a6a27bb3b790ad",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffff800000000000000f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xc563918244f3fff0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -326,21 +341,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -350,36 +365,41 @@
         }
     },
     "Call1024PreCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018542",
-                    "hash" : "fb0a5d2c8812d3079a6e02e6aafc637c39e58bd3b7ce3278108ea83c78010ef8",
-                    "mixHash" : "06cfbd28778aabf887a73d74bcf15492dc5c1b6492b1aae538aba819386e86c5",
-                    "nonce" : "af0563c1a768ca16",
+                    "hash" : "0x9bd7b6ab536796b5f05ac99c2b0503209aee6201ebcbadfc1da3fb7b08c52067",
+                    "mixHash" : "0x406a707b709a43b1185e3144a40c7dce2b2566aa9e67fa73858a899c5fb6e14a",
+                    "nonce" : "0x933c0ed6a744664f",
                     "number" : "0x01",
-                    "parentHash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
-                    "stateRoot" : "d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25",
+                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+                    "receiptTrie" : "0x0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
+                    "stateRoot" : "0xd4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a006cfbd28778aabf887a73d74bcf15492dc5c1b6492b1aae538aba819386e86c588af0563c1a768ca16f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0406a707b709a43b1185e3144a40c7dce2b2566aa9e67fa73858a899c5fb6e14a88933c0ed6a744664ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -389,49 +409,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fb0a5d2c8812d3079a6e02e6aafc637c39e58bd3b7ce3278108ea83c78010ef8",
+        "lastblockhash" : "0x9bd7b6ab536796b5f05ac99c2b0503209aee6201ebcbadfc1da3fb7b08c52067",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffeffffffe7ab3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b5a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563a18244f58542",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07f0",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -443,21 +463,151 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07e8",
+                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024PreCalls_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x022d79b7",
+                    "hash" : "0xec551fd6f15d9172a53628c8a7cb3520c80b954793141c0938be63c0e0476e9b",
+                    "mixHash" : "0xb27e41562ad5aaee105c678b631ef15f6c7a09b90905381b0f8a80f89a99391d",
+                    "nonce" : "0xfdbb893e62b7d60a",
+                    "number" : "0x01",
+                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+                    "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
+                    "stateRoot" : "0x0d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0b27e41562ad5aaee105c678b631ef15f6c7a09b90905381b0f8a80f89a99391d88fdbb893e62b7d60af867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec551fd6f15d9172a53628c8a7cb3520c80b954793141c0938be63c0e0476e9b",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2320",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x45639182472179b7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2a",
+                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x03e4",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
index 4307be2ac..39bee023c 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "CallLoseGasOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "93c8c9ad10f5e34a2a48eacf55f2047a27479c6d83ec019fb5d0356bbac372a2",
-                    "mixHash" : "b7e14a354bbe3d173e187a9fa95ff16bb7c2c1c5e7d59abded07a50b7fd254c9",
-                    "nonce" : "920da84eb2fbaf96",
+                    "hash" : "0xf98b7d7227cd6acace418d4ae64c45394101544afb2c7ab7ee8d0ea60319f5ed",
+                    "mixHash" : "0x4e53e5d5befd5f510eb20e20cbd2ed2b3646bbe972c40a862ed40960cbdefefd",
+                    "nonce" : "0x04751bbe57ec9cc0",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
-                    "stateRoot" : "21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
+                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0b7e14a354bbe3d173e187a9fa95ff16bb7c2c1c5e7d59abded07a50b7fd254c988920da84eb2fbaf96f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a04e53e5d5befd5f510eb20e20cbd2ed2b3646bbe972c40a862ed40960cbdefefd8804751bbe57ec9cc0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "93c8c9ad10f5e34a2a48eacf55f2047a27479c6d83ec019fb5d0356bbac372a2",
+        "lastblockhash" : "0xf98b7d7227cd6acace418d4ae64c45394101544afb2c7ab7ee8d0ea60319f5ed",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd722d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68dc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -92,21 +97,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -116,36 +121,41 @@
         }
     },
     "CallLoseGasOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "b25d0f04ed0c1cc404a637179c705e971b47fa4074a5252c8b8f098592795e7f",
-                    "mixHash" : "ecf35fb1a6d1d8bb2c0321555cf28b28160e19eb1005b36b6479ab9f8dd534c1",
-                    "nonce" : "130374c339bb760f",
+                    "hash" : "0xfe99adff99bf9b5a73c0262514c64187597f21c5ac2090944c62b5331fc0f795",
+                    "mixHash" : "0xaea46ede14ce484bd3c8ddbe6b44211bef4ecfbc24ddc720c5d79f2104d91366",
+                    "nonce" : "0xc98be43338e7173c",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
-                    "stateRoot" : "21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
+                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0ecf35fb1a6d1d8bb2c0321555cf28b28160e19eb1005b36b6479ab9f8dd534c188130374c339bb760ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0aea46ede14ce484bd3c8ddbe6b44211bef4ecfbc24ddc720c5d79f2104d9136688c98be43338e7173cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -155,49 +165,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b25d0f04ed0c1cc404a637179c705e971b47fa4074a5252c8b8f098592795e7f",
+        "lastblockhash" : "0xfe99adff99bf9b5a73c0262514c64187597f21c5ac2090944c62b5331fc0f795",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd722d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68dc8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -208,21 +218,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -232,36 +242,41 @@
         }
     },
     "CallLoseGasOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "d62f9bf1a995870dfcb2bbea7f98910cbb7d13ae4320e508d9e59bc6cab2b347",
-                    "mixHash" : "4086bc6718a514ae489dc65f451331d3dc7d4f7860919bdcafbc217d0e544c6e",
-                    "nonce" : "a9e0c9cdc2d3d491",
+                    "hash" : "0x815a890ebb8c63019d60fb93a0ad3df6193499caa223632cc4964ffde9386968",
+                    "mixHash" : "0x837b7c7c809e6e46b0c49ddf95b23ce567072dae728ff9a2e6a9b5016002d9ab",
+                    "nonce" : "0xbbcbc28ef4039e86",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
-                    "stateRoot" : "e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200c",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0xf139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
+                    "stateRoot" : "0xe2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a04086bc6718a514ae489dc65f451331d3dc7d4f7860919bdcafbc217d0e544c6e88a9e0c9cdc2d3d491f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0837b7c7c809e6e46b0c49ddf95b23ce567072dae728ff9a2e6a9b5016002d9ab88bbcbc28ef4039e86f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -271,49 +286,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d62f9bf1a995870dfcb2bbea7f98910cbb7d13ae4320e508d9e59bc6cab2b347",
+        "lastblockhash" : "0x815a890ebb8c63019d60fb93a0ad3df6193499caa223632cc4964ffde9386968",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffff800000000000000f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xc563918244f3fff0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -322,21 +337,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -346,36 +361,41 @@
         }
     },
     "CallLoseGasOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "6abd7f3bd8ccb3b6fe5a8e006b798c2d7c1adf74ff792e663b691a3dd889f775",
-                    "mixHash" : "f58c3550ab07c290bc296d1c8ad7e6d3efb18f8e51443d4293c2e75910d6695c",
-                    "nonce" : "1e532e71a05cca0d",
+                    "hash" : "0xf705868702cc3f00e1e039953ce6b7bd110992f6c7b4fbcfd1e37c67093aad89",
+                    "mixHash" : "0x7f5f105873dcc915c174caf84a1473ec85865ad2ee6ba9164f24503e603ba161",
+                    "nonce" : "0xf8b966c20055810d",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
-                    "stateRoot" : "f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
+                    "stateRoot" : "0xf3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0f58c3550ab07c290bc296d1c8ad7e6d3efb18f8e51443d4293c2e75910d6695c881e532e71a05cca0df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a07f5f105873dcc915c174caf84a1473ec85865ad2ee6ba9164f24503e603ba16188f8b966c20055810df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -385,49 +405,177 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6abd7f3bd8ccb3b6fe5a8e006b798c2d7c1adf74ff792e663b691a3dd889f775",
+        "lastblockhash" : "0xf705868702cc3f00e1e039953ce6b7bd110992f6c7b4fbcfd1e37c67093aad89",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68972",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x03e9"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallLoseGasOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x028dc8",
+                    "hash" : "0x06fbe023d91ca0b1e5bd9172b6627b9d82429a04816c61f5a289ab5cab81c4ff",
+                    "mixHash" : "0x580ee93780b8cfb4dc5f4a3577a7138753bf12614c91b588f647dd4f3c847f74",
+                    "nonce" : "0x550f55344c23feb9",
+                    "number" : "0x01",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
+                    "stateRoot" : "0xcd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775ba",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775baa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0580ee93780b8cfb4dc5f4a3577a7138753bf12614c91b588f647dd4f3c847f7488550f55344c23feb9f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x06fbe023d91ca0b1e5bd9172b6627b9d82429a04816c61f5a289ab5cab81c4ff",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffffffd722d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f68dc8",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -438,21 +586,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
index 012a6b370..16126e076 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "CallRecursiveBombPreCall_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "83ccf7edf52db43cc0fc4903ce3155d53fb8940249322c0e4516992b59c2d241",
-                    "mixHash" : "b15a9cade4adf3299aad3438a326b3b008f8271b0b5b7f5dd0e6d8bd03edbe7b",
-                    "nonce" : "50f501c3800b9c08",
+                    "hash" : "0x1a2137eaeeee601974f579db388683f4a91808b1975c4821cf3c5436fcdc2b40",
+                    "mixHash" : "0x9b58851779a224733398e421ef66a21e550cc14a2db82dd76f859152eac975d3",
+                    "nonce" : "0xf3afbe8375c1a023",
                     "number" : "0x01",
-                    "parentHash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
-                    "stateRoot" : "10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
+                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
+                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0b15a9cade4adf3299aad3438a326b3b008f8271b0b5b7f5dd0e6d8bd03edbe7b8850f501c3800b9c08f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a09b58851779a224733398e421ef66a21e550cc14a2db82dd76f859152eac975d388f3afbe8375c1a023f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
                         "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "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" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "83ccf7edf52db43cc0fc4903ce3155d53fb8940249322c0e4516992b59c2d241",
+        "lastblockhash" : "0x1a2137eaeeee601974f579db388683f4a91808b1975c4821cf3c5436fcdc2b40",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
@@ -69,14 +74,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245a0b1dd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
@@ -85,39 +90,39 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffff534e22",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "bad304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -125,36 +130,41 @@
         }
     },
     "CallRecursiveBombPreCall_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "12deb6ba0d28ec292b011ae6e386f9aa40f0330fa10c63f3599ecf74d69df85f",
-                    "mixHash" : "8ea9dd1bfbf8b63970dc86babfc8bbdc60b2a59aa5c4326a5b00caabceb31afc",
-                    "nonce" : "333eba1b5cbcb190",
+                    "hash" : "0x9c2597d2bfc100d9d18c7a7153554fbe747686464d208251a394899ef1595cab",
+                    "mixHash" : "0xd5186ac6b47392dee63fc74eb92f7b3e6375f4bbf66d4df012c2ea5b1dd3f673",
+                    "nonce" : "0xd9a5fcaa5e69a0a5",
                     "number" : "0x01",
-                    "parentHash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
-                    "stateRoot" : "10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
+                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
+                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a08ea9dd1bfbf8b63970dc86babfc8bbdc60b2a59aa5c4326a5b00caabceb31afc88333eba1b5cbcb190f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0d5186ac6b47392dee63fc74eb92f7b3e6375f4bbf66d4df012c2ea5b1dd3f67388d9a5fcaa5e69a0a5f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
                         "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -164,28 +174,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "12deb6ba0d28ec292b011ae6e386f9aa40f0330fa10c63f3599ecf74d69df85f",
+        "lastblockhash" : "0x9c2597d2bfc100d9d18c7a7153554fbe747686464d208251a394899ef1595cab",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
@@ -194,14 +204,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245a0b1dd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
@@ -210,39 +220,39 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffff534e22",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "bad304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -250,36 +260,41 @@
         }
     },
     "CallRecursiveBombPreCall_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "f06a40208be7ef8993bb6ab74acc2b7cad81e2d9f329597204f89003d83dbf12",
-                    "mixHash" : "342f0037a25472f28f70793b3510049b49e9643ffc4d4003b9b1d7f2c0b975c3",
-                    "nonce" : "95858f548c832d9d",
+                    "hash" : "0x3faf9a9d2293d6c6f6942ddce6d198459d55db2b212ac6d5f8d46abadd7d29e1",
+                    "mixHash" : "0x1b9cfd4e92623c86cbcd73c3e0da7201c14c90469f8a5bfa1a2354f32d26239c",
+                    "nonce" : "0x9a7323dbb1209445",
                     "number" : "0x01",
-                    "parentHash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
-                    "stateRoot" : "bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834d",
+                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+                    "receiptTrie" : "0x7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
+                    "stateRoot" : "0xbc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0342f0037a25472f28f70793b3510049b49e9643ffc4d4003b9b1d7f2c0b975c38895858f548c832d9df867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a01b9cfd4e92623c86cbcd73c3e0da7201c14c90469f8a5bfa1a2354f32d26239c889a7323dbb1209445f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
                         "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -289,74 +304,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f06a40208be7ef8993bb6ab74acc2b7cad81e2d9f329597204f89003d83dbf12",
+        "lastblockhash" : "0x3faf9a9d2293d6c6f6942ddce6d198459d55db2b212ac6d5f8d46abadd7d29e1",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0xc563918244f3fff0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffff800000000000000f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -364,36 +379,41 @@
         }
     },
     "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa004b5",
-                    "hash" : "17c3f3a9c69ca99913eac9db9a85a4aa3bc3257609e81b4f5a23ddf125466547",
-                    "mixHash" : "331f22c8fc301777e9748765470742bf86b76e799f18b600bbbddb5b95b6aa6f",
-                    "nonce" : "e25521132a51af11",
+                    "hash" : "0xf9a49a610d34ce2183b0d51e0c8ffaa934b1c0c7e3293b982543f199af0360cd",
+                    "mixHash" : "0xf6d414f4a975da3151e97a19742d1d50d302dc89ac4a3d12e07603f7b52edfec",
+                    "nonce" : "0x892c026b85ba616c",
                     "number" : "0x01",
-                    "parentHash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
-                    "stateRoot" : "133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5",
+                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+                    "receiptTrie" : "0x7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
+                    "stateRoot" : "0x133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0331f22c8fc301777e9748765470742bf86b76e799f18b600bbbddb5b95b6aa6f88e25521132a51af11f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0f6d414f4a975da3151e97a19742d1d50d302dc89ac4a3d12e07603f7b52edfec88892c026b85ba616cf867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
                         "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x00"
                     }
@@ -403,28 +423,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "17c3f3a9c69ca99913eac9db9a85a4aa3bc3257609e81b4f5a23ddf125466547",
+        "lastblockhash" : "0xf9a49a610d34ce2183b0d51e0c8ffaa934b1c0c7e3293b982543f199af0360cd",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
@@ -433,14 +453,14 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182459404b5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
@@ -449,39 +469,176 @@
                     "0x01" : "0x01"
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffff5ffb4a",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffff",
+                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRecursiveBombPreCall_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xacb1dd",
+                    "hash" : "0xec1c9bf7e1d46cd1a8bdde6f289312888472d1b40286ff13f835a48d924072a4",
+                    "mixHash" : "0x0ee698edd376191a956a793f7f502296f5a225720ed3da0d98bc5fcc90468760",
+                    "nonce" : "0xd7b9359f4a6d1aa0",
+                    "number" : "0x01",
+                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+                    "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
+                    "stateRoot" : "0x0aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a00ee698edd376191a956a793f7f502296f5a225720ed3da0d98bc5fcc9046876088d7b9359f4a6d1aa0f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
+                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec1c9bf7e1d46cd1a8bdde6f289312888472d1b40286ff13f835a48d924072a4",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffe8",
+                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918245a0b1dd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x03ff",
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffff534e22",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "bad304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
index eb0d01765..40656d3fd 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "CallcodeLoseGasOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "700330e3fbb40724ff2b6900139fd9689eea680965015fbe6d0c5f9896392ad2",
-                    "mixHash" : "e80b0bc9f564ccebe6cceda0bbebf340d5266dd65de6f4be199fd6ef6778482a",
-                    "nonce" : "9a17c6ee21703c9a",
+                    "hash" : "0x697dc5ce9aca91aa966b22d4b7fcb9294583b5bc40eb345e61a6a5d3335a52d4",
+                    "mixHash" : "0x400a0741c7932d0256e365b952fe2133e278d5ddbc3ca4a3c0fd20f8eb1014cc",
+                    "nonce" : "0x10a19eeaef474f39",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
+                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0e80b0bc9f564ccebe6cceda0bbebf340d5266dd65de6f4be199fd6ef6778482a889a17c6ee21703c9af862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0400a0741c7932d0256e365b952fe2133e278d5ddbc3ca4a3c0fd20f8eb1014cc8810a19eeaef474f39f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
                         "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "700330e3fbb40724ff2b6900139fd9689eea680965015fbe6d0c5f9896392ad2",
+        "lastblockhash" : "0x697dc5ce9aca91aa966b22d4b7fcb9294583b5bc40eb345e61a6a5d3335a52d4",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68976",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -90,21 +95,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -114,36 +119,41 @@
         }
     },
     "CallcodeLoseGasOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "03c138c09413cc18e54fffe1bdbb81edb5dbb2bc906562b60263b7dac0f3fd15",
-                    "mixHash" : "80c0faf6190be5495987c850d9494ae5622b879b63ff69d948c8f6dd3a096f31",
-                    "nonce" : "fc45e270c9f24bcb",
+                    "hash" : "0x99ff74a074f246fe3dab1ee9f877f0ffdf45b1f2e2d133c3eb041a7555bdbbe8",
+                    "mixHash" : "0xcbdfa3ec1f87a875420aafc6892b9f182f2b452b02c27afa2aa480c620f610da",
+                    "nonce" : "0x15e6286c6a1fbe8e",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
+                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a080c0faf6190be5495987c850d9494ae5622b879b63ff69d948c8f6dd3a096f3188fc45e270c9f24bcbf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0cbdfa3ec1f87a875420aafc6892b9f182f2b452b02c27afa2aa480c620f610da8815e6286c6a1fbe8ef862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
                         "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
                     }
@@ -153,49 +163,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "03c138c09413cc18e54fffe1bdbb81edb5dbb2bc906562b60263b7dac0f3fd15",
+        "lastblockhash" : "0x99ff74a074f246fe3dab1ee9f877f0ffdf45b1f2e2d133c3eb041a7555bdbbe8",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68976",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -204,21 +214,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -228,36 +238,41 @@
         }
     },
     "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "c73afa0dbac9e8faf303dba2707d2cc451173ff0efbbdca9f4b09f2f8fd652ef",
-                    "mixHash" : "6e13a877b6af63f19484415389673ab6867556f251043822b84011f984f12f5b",
-                    "nonce" : "f52f6acc845a71ed",
+                    "hash" : "0x6e0c3f6e63a996c6d734470e5dd42e78cb581b0cbdd2880e06020efeadb5b08d",
+                    "mixHash" : "0x3996fd1f9f64fb5aa86e2c2e3f438b927c5583a4994150312d8a4e1c3b3be7b7",
+                    "nonce" : "0x5a81014b16e3ff3b",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
+                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a06e13a877b6af63f19484415389673ab6867556f251043822b84011f984f12f5b88f52f6acc845a71edf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a03996fd1f9f64fb5aa86e2c2e3f438b927c5583a4994150312d8a4e1c3b3be7b7885a81014b16e3ff3bf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
                         "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
                     }
@@ -267,49 +282,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c73afa0dbac9e8faf303dba2707d2cc451173ff0efbbdca9f4b09f2f8fd652ef",
+        "lastblockhash" : "0x6e0c3f6e63a996c6d734470e5dd42e78cb581b0cbdd2880e06020efeadb5b08d",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68976",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -318,21 +333,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -342,36 +357,41 @@
         }
     },
     "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "646f29e8bfc4c599133292ea279aa815f4a8ab7c41f0f09e916488025478c35b",
-                    "mixHash" : "1cf29dafe20361708429281990150be567a3cb6e53b14fa39c9c53504dad376f",
-                    "nonce" : "e6aa25eff52a36c3",
+                    "hash" : "0x009ff9cdd82602e41f7ffb75d74d560d563a098eceb8e21e31ffc49a3bbe9f3b",
+                    "mixHash" : "0xefb4821b81f3b6d4a9dca1ac3b69639576a31dcbe81a5c5fdf108ffd8723b437",
+                    "nonce" : "0xb65f9c5efc84602b",
                     "number" : "0x01",
-                    "parentHash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
-                    "stateRoot" : "f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
+                    "stateRoot" : "0xf3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a01cf29dafe20361708429281990150be567a3cb6e53b14fa39c9c53504dad376f88e6aa25eff52a36c3f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0efb4821b81f3b6d4a9dca1ac3b69639576a31dcbe81a5c5fdf108ffd8723b43788b65f9c5efc84602bf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
                         "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1b",
                         "value" : "0x0a"
                     }
@@ -381,49 +401,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "646f29e8bfc4c599133292ea279aa815f4a8ab7c41f0f09e916488025478c35b",
+        "lastblockhash" : "0x009ff9cdd82602e41f7ffb75d74d560d563a098eceb8e21e31ffc49a3bbe9f3b",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7683",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918244f68972",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -434,21 +454,147 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallcodeLoseGasOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x028976",
+                    "hash" : "0x5fc786bb0f634d2a14b04eeabeb1c66c2c0eed9a910634e8eb5c94088f479c32",
+                    "mixHash" : "0x37545377825340eb1b938f29f7443377ac344d96748f766170ce1e6bf709ecb3",
+                    "nonce" : "0x0410bc7ec3fafb9f",
+                    "number" : "0x01",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
+                    "stateRoot" : "0xde050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0de050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a037545377825340eb1b938f29f7443377ac344d96748f766170ce1e6bf709ecb3880410bc7ec3fafb9ff862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x028976",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
+                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5fc786bb0f634d2a14b04eeabeb1c66c2c0eed9a910634e8eb5c94088f479c32",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffffffd7689",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f68976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
index 90ecb9727..7bad00fea 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Delegatecall1024OOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "91407846926b488512e123e32cd5ccd87793ad271308576f9ee974160ffb67fa",
-                    "mixHash" : "4d37232a2e409f1dbf4da2f6c242ced83589cf2956a71588612bb186d0e8ffd7",
-                    "nonce" : "6dc9749e6b05c89f",
+                    "hash" : "0xa5679d67773de7af9881fc3c2540bf8fb0898b0853093e0802cfcf59c18db997",
+                    "mixHash" : "0x2d03e47b0d1bc0e4c84eefad228b5e885c6ba093c29893f2d53b9da7b9b5f11c",
+                    "nonce" : "0x2039636e83fd9646",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a04d37232a2e409f1dbf4da2f6c242ced83589cf2956a71588612bb186d0e8ffd7886dc9749e6b05c89ff862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a02d03e47b0d1bc0e4c84eefad228b5e885c6ba093c29893f2d53b9da7b9b5f11c882039636e83fd9646f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "91407846926b488512e123e32cd5ccd87793ad271308576f9ee974160ffb67fa",
+        "lastblockhash" : "0xa5679d67773de7af9881fc3c2540bf8fb0898b0853093e0802cfcf59c18db997",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182452e8720",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -93,21 +98,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -117,36 +122,41 @@
         }
     },
     "Delegatecall1024OOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "c5249f63a7fd0e378d0018122be92c39feff65dc279686853e9b521cfc3702cc",
-                    "mixHash" : "4a4940bc004a2e2b641bbc820674eec1413f9c343dc773bbc9116bfdb1c4a88a",
-                    "nonce" : "2cd0e41154ade8fb",
+                    "hash" : "0x1d158db0206b57bb24995041ca956ab76588465bb5073b3d17854107eeb9916f",
+                    "mixHash" : "0x8da62b09ccd21f38711b42e476969c5a119a94a38f9357c476a24ddcecdb3cb3",
+                    "nonce" : "0x690ccdca76bf2cfc",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a04a4940bc004a2e2b641bbc820674eec1413f9c343dc773bbc9116bfdb1c4a88a882cd0e41154ade8fbf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a08da62b09ccd21f38711b42e476969c5a119a94a38f9357c476a24ddcecdb3cb388690ccdca76bf2cfcf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -156,49 +166,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c5249f63a7fd0e378d0018122be92c39feff65dc279686853e9b521cfc3702cc",
+        "lastblockhash" : "0x1d158db0206b57bb24995041ca956ab76588465bb5073b3d17854107eeb9916f",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182452e8720",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -210,21 +220,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -234,36 +244,41 @@
         }
     },
     "Delegatecall1024OOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe17a",
-                    "hash" : "bd337b6831a4a1de7d642ccd1cfada53b4b83eee4233b79c85392a2615b236ee",
-                    "mixHash" : "1203d3d91fe20f54bc0f3b4935a5fd8f3312c1c5e7bafd3b856c206ea97f4709",
-                    "nonce" : "8a543122108bbbcf",
+                    "hash" : "0x87fcdd83c2ffbe9d1adc1b7b9cb66578eac021910cc9c4ff3a3c730aa35acb13",
+                    "mixHash" : "0x00eb9e5fba74012daeb5077fb109c64fd823b439e1227c5347a40e5a09bab53d",
+                    "nonce" : "0x35ebae81278d52fc",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
-                    "stateRoot" : "f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
+                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a01203d3d91fe20f54bc0f3b4935a5fd8f3312c1c5e7bafd3b856c206ea97f4709888a543122108bbbcff862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a000eb9e5fba74012daeb5077fb109c64fd823b439e1227c5347a40e5a09bab53d8835ebae81278d52fcf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -273,49 +288,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bd337b6831a4a1de7d642ccd1cfada53b4b83eee4233b79c85392a2615b236ee",
+        "lastblockhash" : "0x87fcdd83c2ffbe9d1adc1b7b9cb66578eac021910cc9c4ff3a3c730aa35acb13",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff101e85",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918245e3e17a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -324,21 +339,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -348,36 +363,41 @@
         }
     },
     "Delegatecall1024OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "eecef4ac1c95cbe9c2867279c3e1514d714475a8f69b7bc424b6f149b6158ba8",
-                    "mixHash" : "48d458be2a91e61a9be090a4cdc8bcfac89111adcceca03e109b01f5cb40851b",
-                    "nonce" : "62550af9a64a7687",
+                    "hash" : "0xd5874b6536f4c11682136fddab4855f0ea33742b6a95c1ed22712e0b89f7c511",
+                    "mixHash" : "0xb707218b0597a91be78d83e3ff6f24a4207eab4d08dc5a4a8e2538e7821f7b3f",
+                    "nonce" : "0xea7f3370319dbcf4",
                     "number" : "0x01",
-                    "parentHash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
-                    "stateRoot" : "7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
+                    "stateRoot" : "0x7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a048d458be2a91e61a9be090a4cdc8bcfac89111adcceca03e109b01f5cb40851b8862550af9a64a7687f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0b707218b0597a91be78d83e3ff6f24a4207eab4d08dc5a4a8e2538e7821f7b3f88ea7f3370319dbcf4f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
                         "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -387,49 +407,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "eecef4ac1c95cbe9c2867279c3e1514d714475a8f69b7bc424b6f149b6158ba8",
+        "lastblockhash" : "0xd5874b6536f4c11682136fddab4855f0ea33742b6a95c1ed22712e0b89f7c511",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff102a7f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563918245e3d576",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
@@ -441,21 +461,150 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Delegatecall1024OOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x3a8720",
+                    "hash" : "0x9a85f48e0a3a25fb8bb7e1bde49d55fddcc93a118f7a553770d50a10eb0b2647",
+                    "mixHash" : "0x715dc5189454d46fe36639995f5694905625bed7852e2933c4cf8653fa1c5631",
+                    "nonce" : "0xd8a8e70f4aa7f576",
+                    "number" : "0x01",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
+                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0715dc5189454d46fe36639995f5694905625bed7852e2933c4cf8653fa1c563188d8a8e70f4aa7f576f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xefe17a",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
+                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9a85f48e0a3a25fb8bb7e1bde49d55fddcc93a118f7a553770d50a10eb0b2647",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffc578d5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x45639182452e8720",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x85",
+                    "0x01" : "0x01",
+                    "0x02" : "0x020789"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
index 070002168..a79a4572e 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Delegatecall1024_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "ddc38283f6ef43e15569eaedfddf13272071da22ef3d59b3bf85dd54c07a134c",
-                    "mixHash" : "1b8195be2c2d6edd1ae39e833e9bf141af1042f06175c2e905b4192cc32d1c5e",
-                    "nonce" : "a670240cde82a1ef",
+                    "hash" : "0x3a2ed5c5ed53f7f5ea2fe1056ad0140c1825259dc0357497ca947f2cb6382ecf",
+                    "mixHash" : "0x8fb518659ed2097d8769bbda0fca18bf9484bbdfca3fdd3e792f8c299c521b7e",
+                    "nonce" : "0x91c0664c517b0319",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a01b8195be2c2d6edd1ae39e833e9bf141af1042f06175c2e905b4192cc32d1c5e88a670240cde82a1eff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a08fb518659ed2097d8769bbda0fca18bf9484bbdfca3fdd3e792f8c299c521b7e8891c0664c517b0319f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ddc38283f6ef43e15569eaedfddf13272071da22ef3d59b3bf85dd54c07a134c",
+        "lastblockhash" : "0x3a2ed5c5ed53f7f5ea2fe1056ad0140c1825259dc0357497ca947f2cb6382ecf",
         "network" : "EIP150",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182459fc5ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -92,21 +97,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -116,36 +121,41 @@
         }
     },
     "Delegatecall1024_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "eec83f2a27d125b42959da65ed26a0645c47076a953537090f95ecd102d8eb0e",
-                    "mixHash" : "901903dc4dec169d5e1da2ee6bb3acc6d9ae75ab64d7ef59e5078424751fbad0",
-                    "nonce" : "f4e8d76657efbacc",
+                    "hash" : "0x798963e563e9d186adf2df13ede935a4ac00a4d504ad37b4ddbb47f660ead709",
+                    "mixHash" : "0x9b722c82384b3bf93e71c7bfe18a8e8c4d627680ddfbb8eb362363d74e365f1d",
+                    "nonce" : "0x620f0d689f7e0b30",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0901903dc4dec169d5e1da2ee6bb3acc6d9ae75ab64d7ef59e5078424751fbad088f4e8d76657efbaccf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a09b722c82384b3bf93e71c7bfe18a8e8c4d627680ddfbb8eb362363d74e365f1d88620f0d689f7e0b30f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -155,49 +165,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "eec83f2a27d125b42959da65ed26a0645c47076a953537090f95ecd102d8eb0e",
+        "lastblockhash" : "0x798963e563e9d186adf2df13ede935a4ac00a4d504ad37b4ddbb47f660ead709",
         "network" : "EIP158",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x45639182459fc5ed",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -208,21 +218,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -232,36 +242,41 @@
         }
     },
     "Delegatecall1024_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "ba7c0413ad1f58f4f5013d0f5b0f66bc35f79d3f53b01668efb3fbd230c527a6",
-                    "mixHash" : "59c83a14dde992be7f958ae304bc4422dd3aee2faf80ca25262e093ba5d10b2a",
-                    "nonce" : "742de3268dce04ab",
+                    "hash" : "0xffd6898c170e0f37eb770128f12186c5acb936d5aa741c85c0574aaeab5e0008",
+                    "mixHash" : "0x0c8653bd499cbbbec3dcc47bce81b94724325daa89a00fc489d342bd12d76f36",
+                    "nonce" : "0x1462ed8967201816",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
-                    "stateRoot" : "cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0xdce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
+                    "stateRoot" : "0xcf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a059c83a14dde992be7f958ae304bc4422dd3aee2faf80ca25262e093ba5d10b2a88742de3268dce04abf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a00c8653bd499cbbbec3dcc47bce81b94724325daa89a00fc489d342bd12d76f36881462ed8967201816f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -271,49 +286,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ba7c0413ad1f58f4f5013d0f5b0f66bc35f79d3f53b01668efb3fbd230c527a6",
+        "lastblockhash" : "0xffd6898c170e0f37eb770128f12186c5acb936d5aa741c85c0574aaeab5e0008",
         "network" : "Frontier",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffff800000000000000f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xc563918244f3fff0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -322,21 +337,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -346,36 +361,41 @@
         }
     },
     "Delegatecall1024_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "6595ad2c86f353fd321067417675b21eb1971fb68dd4a5353e05133303336570",
-                    "mixHash" : "a450f2ca50338b7dd85fe30b6f2d20a267ec3ba3349acab1b7e60097ccf6be26",
-                    "nonce" : "92114a355809005f",
+                    "hash" : "0xc0c726b088c9a213be7e34cb178fe6080ea6e0a89dc69ac4b6938954d0178401",
+                    "mixHash" : "0x385359204ac6f6343a0515060dfa41eeaac8c87f3fa267caabbe7c5afbdedcb4",
+                    "nonce" : "0x04a96222c1910ff6",
                     "number" : "0x01",
-                    "parentHash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
-                    "stateRoot" : "8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
+                    "stateRoot" : "0x8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0a450f2ca50338b7dd85fe30b6f2d20a267ec3ba3349acab1b7e60097ccf6be268892114a355809005ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0385359204ac6f6343a0515060dfa41eeaac8c87f3fa267caabbe7c5afbdedcb48804a96222c1910ff6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -385,49 +405,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6595ad2c86f353fd321067417675b21eb1971fb68dd4a5353e05133303336570",
+        "lastblockhash" : "0xc0c726b088c9a213be7e34cb178fe6080ea6e0a89dc69ac4b6938954d0178401",
         "network" : "Homestead",
         "postState" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff4bcb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4563a18244f4b42a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
@@ -437,21 +457,149 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Delegatecall1024_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xabc5ed",
+                    "hash" : "0x3e674c36e51a3bcea74df6d3ecae8f2ae9e60480762c81663048dd95d4b67fdc",
+                    "mixHash" : "0x072cb106e4672b73f39be18a8c2a69513682a49116817247f3f0c22df159387b",
+                    "nonce" : "0xcc683a79c9665f06",
+                    "number" : "0x01",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
+                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0072cb106e4672b73f39be18a8c2a69513682a49116817247f3f0c22df159387b88cc683a79c9665f06f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3e674c36e51a3bcea74df6d3ecae8f2ae9e60480762c81663048dd95d4b67fdc",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffff543a08",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x45639182459fc5ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
deleted file mode 100644
index cecf002b3..000000000
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-    "callOutput1_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "77498468f2f7b9177ef82354b8b85303fb5521300a39e664a36b80afb544f0b3",
-                    "mixHash" : "e41353b4a54609852ef0a4c5aaa4c625fb03008d0b1cf6e62e1573534c0ff6a2",
-                    "nonce" : "1a3ff1bb56bc315a",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e41353b4a54609852ef0a4c5aaa4c625fb03008d0b1cf6e62e1573534c0ff6a2881a3ff1bb56bc315ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "77498468f2f7b9177ef82354b8b85303fb5521300a39e664a36b80afb544f0b3",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "b80af278d6fc5ab65f6aecb1eaef4e0b31273c48e236f30c697b896e7d145114",
-                    "mixHash" : "58fca66e29211740fb0d2e8733254ab436ccfc45c9f249bb8c3a7731beb32089",
-                    "nonce" : "fb489748d32af824",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a058fca66e29211740fb0d2e8733254ab436ccfc45c9f249bb8c3a7731beb3208988fb489748d32af824c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b80af278d6fc5ab65f6aecb1eaef4e0b31273c48e236f30c697b896e7d145114",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "49b9eb7c740b3b19286e5b8f5d6207028584655adf04533c021e0798c3b370c8",
-                    "mixHash" : "eb433368ab8d4dd958dc5ecc8d8ac601c2e8d723720fc55c408e79e5b03471b8",
-                    "nonce" : "f93c31988c5331e0",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0eb433368ab8d4dd958dc5ecc8d8ac601c2e8d723720fc55c408e79e5b03471b888f93c31988c5331e0c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "49b9eb7c740b3b19286e5b8f5d6207028584655adf04533c021e0798c3b370c8",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "195862b391be5a4a84b95ea475bed21a8ed190f9d84b49c97e84ec7bf96316ca",
-                    "mixHash" : "cd7de149824e80e44220267cebefeef432ee07ac3e2400ab689b379f2d7383e7",
-                    "nonce" : "d81b04d19d991817",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cd7de149824e80e44220267cebefeef432ee07ac3e2400ab689b379f2d7383e788d81b04d19d991817c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "195862b391be5a4a84b95ea475bed21a8ed190f9d84b49c97e84ec7bf96316ca",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g1v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "ec37be9bdee769aa7c4c515a15553243376f9b602d306c35e10686a3fe10053a",
-                    "mixHash" : "11a508b566324d85171be96c9bab1db0c1d7d86738bd1ac1957957d7ca7b0797",
-                    "nonce" : "480cd73c8c4bdab8",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
-                    "stateRoot" : "2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a011a508b566324d85171be96c9bab1db0c1d7d86738bd1ac1957957d7ca7b079788480cd73c8c4bdab8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ec37be9bdee769aa7c4c515a15553243376f9b602d306c35e10686a3fe10053a",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g1v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "17fac789ac7a2f6d205ab0422e0177322868a8dd234275729931a5ac0062b760",
-                    "mixHash" : "9b73691dbe1107f1926f901c19482787c64825b4a1565dc4b36698028852942d",
-                    "nonce" : "a4ead7d909c93218",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
-                    "stateRoot" : "2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a09b73691dbe1107f1926f901c19482787c64825b4a1565dc4b36698028852942d88a4ead7d909c93218f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "17fac789ac7a2f6d205ab0422e0177322868a8dd234275729931a5ac0062b760",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g1v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "9e9bcbe30a2f3ac40f9ef46140f1ff295422042e974bb0d33b7746ba1bde9d75",
-                    "mixHash" : "4e6bd248202c9ab3917bddbdd231fc97823dea9ba23ef045884e5a2549d31a74",
-                    "nonce" : "292c24b80227ac93",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
-                    "stateRoot" : "224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a04e6bd248202c9ab3917bddbdd231fc97823dea9ba23ef045884e5a2549d31a7488292c24b80227ac93f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9e9bcbe30a2f3ac40f9ef46140f1ff295422042e974bb0d33b7746ba1bde9d75",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g1v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "552d7cf42ea198395a82465c22a49a944b2896c05b754cd1ceac5895cb0ae3f7",
-                    "mixHash" : "88345cb9d1e7e9c942acc875c14e908b4e5d50a1c4c363101c55cc551fdef29d",
-                    "nonce" : "9814ecc9a81d6cab",
-                    "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
-                    "stateRoot" : "2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a088345cb9d1e7e9c942acc875c14e908b4e5d50a1c4c363101c55cc551fdef29d889814ecc9a81d6cabf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "552d7cf42ea198395a82465c22a49a944b2896c05b754cd1ceac5895cb0ae3f7",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
new file mode 100644
index 000000000..5413a901f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
@@ -0,0 +1,549 @@
+{
+    "callOutput1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x9750b492f360d12e972160fc6e5d63174b30be340ef5b43b7f5e59b9ed7dd2b3",
+                    "mixHash" : "0x35f2cc12a676e98848be6524eb2c8ebde4ecbc795d075dbd99b0b3dce2b9a9c3",
+                    "nonce" : "0xcd444ed07b5f4be4",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035f2cc12a676e98848be6524eb2c8ebde4ecbc795d075dbd99b0b3dce2b9a9c388cd444ed07b5f4be4c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9750b492f360d12e972160fc6e5d63174b30be340ef5b43b7f5e59b9ed7dd2b3",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x99d163dfb2ac725bd6c809b944b63e5576691ce67e29d6e81c6c37f15b1aa95c",
+                    "mixHash" : "0x2fbc0c824c05256969de45d341c4868f7d617a128957f9e086ac8454d008d289",
+                    "nonce" : "0x26c55935e78209ab",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02fbc0c824c05256969de45d341c4868f7d617a128957f9e086ac8454d008d2898826c55935e78209abc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x99d163dfb2ac725bd6c809b944b63e5576691ce67e29d6e81c6c37f15b1aa95c",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x19b96f63eeb4c2a0a7d6f07a954c0da4b5dfc81e7c18186753d0a1ae52b1e9d0",
+                    "mixHash" : "0x4beb998f9b334addd8942d1f5bd5a91d3c7cc2d76ae01273532966066972e3fc",
+                    "nonce" : "0x7b8cd413fdc8ef2a",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04beb998f9b334addd8942d1f5bd5a91d3c7cc2d76ae01273532966066972e3fc887b8cd413fdc8ef2ac0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x19b96f63eeb4c2a0a7d6f07a954c0da4b5dfc81e7c18186753d0a1ae52b1e9d0",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xd66a90bfcf25704b70f709e9be15996337697d53b33b895d5464e13028e1843c",
+                    "mixHash" : "0xa3947200dd1e741415d6db86380d8f68f12a596366ec1ef5cc0c289481815b74",
+                    "nonce" : "0x4470be7ceefc7739",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3947200dd1e741415d6db86380d8f68f12a596366ec1ef5cc0c289481815b74884470be7ceefc7739c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd66a90bfcf25704b70f709e9be15996337697d53b33b895d5464e13028e1843c",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x2f9153894ce615a2c9373b9f523559ec7c6d6e3036733523cf99f12a0c1ffb66",
+                    "mixHash" : "0x7b5d10d2a5a4c89b4f55a92d688177148408651eb5d2c41079cb81fbfc36836b",
+                    "nonce" : "0xfb386255fa6e1850",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07b5d10d2a5a4c89b4f55a92d688177148408651eb5d2c41079cb81fbfc36836b88fb386255fa6e1850c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2f9153894ce615a2c9373b9f523559ec7c6d6e3036733523cf99f12a0c1ffb66",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
new file mode 100644
index 000000000..9e035139f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
@@ -0,0 +1,608 @@
+{
+    "callOutput1_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0xf0991797b487884121acbe150e9b7863d9ad3ff6d4a3d47f81984aac5f277f28",
+                    "mixHash" : "0xd2f454f66d218f3886a735e8fe287fa07a84b4373f15766944f1658417747f87",
+                    "nonce" : "0x273524d38e60a870",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0xd1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
+                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0d2f454f66d218f3886a735e8fe287fa07a84b4373f15766944f1658417747f8788273524d38e60a870f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf0991797b487884121acbe150e9b7863d9ad3ff6d4a3d47f81984aac5f277f28",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x987179198a15eaa2b39ed6da7262951533a3a86ec60a030974b4802b9facdd9b",
+                    "mixHash" : "0xfadd42ba211e6ba51a6675c25bd4348d2298ab4811106383819469217e22d7d4",
+                    "nonce" : "0x983a296fb5017a4c",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0xb42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
+                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0fadd42ba211e6ba51a6675c25bd4348d2298ab4811106383819469217e22d7d488983a296fb5017a4cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x987179198a15eaa2b39ed6da7262951533a3a86ec60a030974b4802b9facdd9b",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0xd9fc219b5aa61bebfeb97336dbbc384461836573a180419868a173f5f28a7b28",
+                    "mixHash" : "0x503ae887ab836940d7beb9340a06fa9287694e1c8d7a909f3827f8d032373be2",
+                    "nonce" : "0x214ea3d7dc76834d",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
+                    "stateRoot" : "0x224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0503ae887ab836940d7beb9340a06fa9287694e1c8d7a909f3827f8d032373be288214ea3d7dc76834df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd9fc219b5aa61bebfeb97336dbbc384461836573a180419868a173f5f28a7b28",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0xf20c5d0f7082200bc8e04eb88700b51d19c6c9715c06015ac5efe8d041f82da9",
+                    "mixHash" : "0xcdd82ddb8f7168ba77391758cc78e93190d513b440f5cc4a3007bd81e30e58fe",
+                    "nonce" : "0x3a2d03a7a379aad6",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
+                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0cdd82ddb8f7168ba77391758cc78e93190d513b440f5cc4a3007bd81e30e58fe883a2d03a7a379aad6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf20c5d0f7082200bc8e04eb88700b51d19c6c9715c06015ac5efe8d041f82da9",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x2ef4a5b77e653a87518c41a961379408635a0170b4679ac47787b30672bd197c",
+                    "mixHash" : "0x8bca25e069fed4ca9ac3f3a7a20b9cecf7437a5b02f9105569e36bdf72620a08",
+                    "nonce" : "0xfb1456e012593f97",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xaf2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a08bca25e069fed4ca9ac3f3a7a20b9cecf7437a5b02f9105569e36bdf72620a0888fb1456e012593f97f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ef4a5b77e653a87518c41a961379408635a0170b4679ac47787b30672bd197c",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
deleted file mode 100644
index c9ebcd0ab..000000000
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-    "callOutput2_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "e680b05e3333c857d84287bacab6b2f1b62f7fd0f337147ea431e29892c03021",
-                    "mixHash" : "822b543e772c7ebcaa801cd545cba4f3ff98a0bedfac06cf9dc7ba97fe8bc163",
-                    "nonce" : "908a1634f525fa46",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0822b543e772c7ebcaa801cd545cba4f3ff98a0bedfac06cf9dc7ba97fe8bc16388908a1634f525fa46c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e680b05e3333c857d84287bacab6b2f1b62f7fd0f337147ea431e29892c03021",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "fe1c6f7b5b017c747a22607f4614a62bd932c158fd55dd50aaa6c591c75c0f9b",
-                    "mixHash" : "9aba5e409d5211bb372dc677f5ac69abb2b5593cab2fa8ca260015370ff981c7",
-                    "nonce" : "c8fc91a1e056fe06",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09aba5e409d5211bb372dc677f5ac69abb2b5593cab2fa8ca260015370ff981c788c8fc91a1e056fe06c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fe1c6f7b5b017c747a22607f4614a62bd932c158fd55dd50aaa6c591c75c0f9b",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "7a0fa275e50a97a88c01721d9ee2b79ee3419e5ee0a52bf7783b96e30aaafc0e",
-                    "mixHash" : "b1229cef7ec35e5f25884aceec421db56b36c9c38b863bbde892f9947a264fa6",
-                    "nonce" : "f3773b7b3c12a11d",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b1229cef7ec35e5f25884aceec421db56b36c9c38b863bbde892f9947a264fa688f3773b7b3c12a11dc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7a0fa275e50a97a88c01721d9ee2b79ee3419e5ee0a52bf7783b96e30aaafc0e",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "68fa991d8360e0348f8b3d655a27f6411f17ca8cc4aa8704afdd31957f2a5073",
-                    "mixHash" : "16365029d9cfa26c8281cbc01cf9fd6c46ddc090a92675bc424578614f4b7c37",
-                    "nonce" : "a5f53c3832528186",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a016365029d9cfa26c8281cbc01cf9fd6c46ddc090a92675bc424578614f4b7c3788a5f53c3832528186c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "68fa991d8360e0348f8b3d655a27f6411f17ca8cc4aa8704afdd31957f2a5073",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g1v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "1510d3294dc3e6b047dc62ca897ee0fb8f0203966b7e7b01141209c5c54d7045",
-                    "mixHash" : "7fc75bac4b540d29647bc2c28ae3dafe068e4a26e4743a14a5b8bfc33663c713",
-                    "nonce" : "b12b80f03d0017a3",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
-                    "stateRoot" : "da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a07fc75bac4b540d29647bc2c28ae3dafe068e4a26e4743a14a5b8bfc33663c71388b12b80f03d0017a3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1510d3294dc3e6b047dc62ca897ee0fb8f0203966b7e7b01141209c5c54d7045",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g1v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "c8c914847f66d079468ba89ebffd34217cb3ab6459e7c34582ee4941cbe15f76",
-                    "mixHash" : "5732296739fd2eefa4b14bc314ea25ce97e89cf1bdd979c4057c53650aa91ffe",
-                    "nonce" : "3c9c67c56dde3d12",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
-                    "stateRoot" : "da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a05732296739fd2eefa4b14bc314ea25ce97e89cf1bdd979c4057c53650aa91ffe883c9c67c56dde3d12f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c8c914847f66d079468ba89ebffd34217cb3ab6459e7c34582ee4941cbe15f76",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g1v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "2880a76edbd3e89f6b911cf9d1df52b80c45ce45644a571a931573ff4aa238aa",
-                    "mixHash" : "3cf43dbab2b3cefaaa5e4993bab6cd0badd544a174c3fca1ac07ad050cca16af",
-                    "nonce" : "a22004fd7adf489d",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
-                    "stateRoot" : "883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18cee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a03cf43dbab2b3cefaaa5e4993bab6cd0badd544a174c3fca1ac07ad050cca16af88a22004fd7adf489df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2880a76edbd3e89f6b911cf9d1df52b80c45ce45644a571a931573ff4aa238aa",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g1v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "27caa5b2915af6224d5ca7b3aed50b6cbb796378cf09c737978e269975e92d78",
-                    "mixHash" : "478371b07c90e31c16c04573eaf512306c6774202392e10afe318f210d060e3c",
-                    "nonce" : "e5b8856f4ce7af3a",
-                    "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
-                    "stateRoot" : "da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0478371b07c90e31c16c04573eaf512306c6774202392e10afe318f210d060e3c88e5b8856f4ce7af3af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "27caa5b2915af6224d5ca7b3aed50b6cbb796378cf09c737978e269975e92d78",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
new file mode 100644
index 000000000..041f1a420
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
@@ -0,0 +1,549 @@
+{
+    "callOutput2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xec9c10e8c6c3ef5143f3347bf57d77d2b364a4546f89ae41f8ca5b4cfb3a50cb",
+                    "mixHash" : "0x47b6bb1fdd812d7b9da72e0790b1ac9d91dfd09812db34d43079b6ae5ec42c03",
+                    "nonce" : "0xa964e975d1623600",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047b6bb1fdd812d7b9da72e0790b1ac9d91dfd09812db34d43079b6ae5ec42c0388a964e975d1623600c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec9c10e8c6c3ef5143f3347bf57d77d2b364a4546f89ae41f8ca5b4cfb3a50cb",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x8147fb075c0f47be4900082858b8b1db35dbdb159559c182529fd6ef83ee9819",
+                    "mixHash" : "0x5767918a01c83997064a44e2171e76e21e7bccf795994286ecdeeebd7488c503",
+                    "nonce" : "0xcd0b976b3dac4bdc",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05767918a01c83997064a44e2171e76e21e7bccf795994286ecdeeebd7488c50388cd0b976b3dac4bdcc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8147fb075c0f47be4900082858b8b1db35dbdb159559c182529fd6ef83ee9819",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xd61fb684ed00558694e145513937b3bc475572da6cfc322a72dc4788e69b9e06",
+                    "mixHash" : "0x3fbb5e36ffb8aa4b714b6270fcbc9e1bf2ffbdaf2bae431fe690031641e3c4a8",
+                    "nonce" : "0xfe72511ba0aebbb3",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03fbb5e36ffb8aa4b714b6270fcbc9e1bf2ffbdaf2bae431fe690031641e3c4a888fe72511ba0aebbb3c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd61fb684ed00558694e145513937b3bc475572da6cfc322a72dc4788e69b9e06",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xbb90feb8d8a65d3fdcf9796af6357f1c29b93c485a00013a68149531abef3c55",
+                    "mixHash" : "0x7d79329970eba3b58d8b5e8c0bd72b992814d00ebbfe52568f3e4723dbabd601",
+                    "nonce" : "0x52bdc30b2affd11d",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07d79329970eba3b58d8b5e8c0bd72b992814d00ebbfe52568f3e4723dbabd6018852bdc30b2affd11dc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb90feb8d8a65d3fdcf9796af6357f1c29b93c485a00013a68149531abef3c55",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x31a8fc62d3c71bb35cf71b685f3a3c4272f0fb32d2d7fbb1b1a95011b0e64f6c",
+                    "mixHash" : "0x898a53c743d7b2502f2c97461687613bd7617c4ea90c2f7e8eae3f8172102602",
+                    "nonce" : "0xaba9ad750f2bb3e1",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0898a53c743d7b2502f2c97461687613bd7617c4ea90c2f7e8eae3f817210260288aba9ad750f2bb3e1c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x31a8fc62d3c71bb35cf71b685f3a3c4272f0fb32d2d7fbb1b1a95011b0e64f6c",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
new file mode 100644
index 000000000..7a624c36b
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
@@ -0,0 +1,608 @@
+{
+    "callOutput2_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x4ac877a0ccadaecc439f8cb55b9a1cc58d5bd1d85965fbbceca491f93d78e328",
+                    "mixHash" : "0xcf9b8d20da3180f73f974e748125b88ccca7c41fd797c1ebb051cefaf8ddd55e",
+                    "nonce" : "0x19f3addb218aa64f",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
+                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0cf9b8d20da3180f73f974e748125b88ccca7c41fd797c1ebb051cefaf8ddd55e8819f3addb218aa64ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4ac877a0ccadaecc439f8cb55b9a1cc58d5bd1d85965fbbceca491f93d78e328",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0xe343317ad0559166a5dee16ff55d5dea419970566e59e1f9631fb70b76d58bca",
+                    "mixHash" : "0x0a10b851008d26ddc94b82b869f64e091dd634c98907fd81ee5794510ac19506",
+                    "nonce" : "0xdc8acb825caa8775",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
+                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a00a10b851008d26ddc94b82b869f64e091dd634c98907fd81ee5794510ac1950688dc8acb825caa8775f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe343317ad0559166a5dee16ff55d5dea419970566e59e1f9631fb70b76d58bca",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x214366d6f292a1e53e72b1f966591d922e52543b6685004a62f1b479fd2d5ac3",
+                    "mixHash" : "0x93361f3f4d87a96d42b2c3c5e865f2cda3f389fe50cf5972078c8d7ef971b680",
+                    "nonce" : "0xf62159098fc6bf5f",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
+                    "stateRoot" : "0x883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18cee",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a093361f3f4d87a96d42b2c3c5e865f2cda3f389fe50cf5972078c8d7ef971b68088f62159098fc6bf5ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x214366d6f292a1e53e72b1f966591d922e52543b6685004a62f1b479fd2d5ac3",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x860e6a7259729dbf7504c846ce94034ba97f24187f251bd6f9dff4379918611f",
+                    "mixHash" : "0x8f4f448089ddc08ca2f170974fadbaf6fb0ecd102bdbe96c409303357d140bda",
+                    "nonce" : "0x217fb12235d7baa7",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
+                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a08f4f448089ddc08ca2f170974fadbaf6fb0ecd102bdbe96c409303357d140bda88217fb12235d7baa7f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x860e6a7259729dbf7504c846ce94034ba97f24187f251bd6f9dff4379918611f",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x34300515593a0d36fd751068112429357dd38c586eeaefb4fec96758b429e0e1",
+                    "mixHash" : "0xd4e6d44fe07e4b713eefb542f113e675025b281696c0dbea45e7e7751a7b0973",
+                    "nonce" : "0xab971ead2738c9ec",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xc1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0d4e6d44fe07e4b713eefb542f113e675025b281696c0dbea45e7e7751a7b097388ab971ead2738c9ecf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x34300515593a0d36fd751068112429357dd38c586eeaefb4fec96758b429e0e1",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
deleted file mode 100644
index dbe48e52b..000000000
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-    "callOutput3_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "f1ac29a2596c36af1167759a5e41def55da1b29b305c5f02d463eb8044bf146e",
-                    "mixHash" : "2feb37fecc209ee7457a87f950eccb427079db86010e95c11b9f669a27457724",
-                    "nonce" : "f94a84fb6e90c0a7",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02feb37fecc209ee7457a87f950eccb427079db86010e95c11b9f669a2745772488f94a84fb6e90c0a7c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f1ac29a2596c36af1167759a5e41def55da1b29b305c5f02d463eb8044bf146e",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "d1052f79df1ed4465c92ad6264c62e77309265a5abe0716c6703be7e7676b845",
-                    "mixHash" : "51152ff8325ec87cba1ea90025cbeafea98386c26d1168e7fd8f9bb85cfdc0b1",
-                    "nonce" : "64bafa074f2bcdeb",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a051152ff8325ec87cba1ea90025cbeafea98386c26d1168e7fd8f9bb85cfdc0b18864bafa074f2bcdebc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d1052f79df1ed4465c92ad6264c62e77309265a5abe0716c6703be7e7676b845",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0e7f13f4408a7c40943c26b14e555144b2f4d3c44df87c746a1f5d5f4d261a50",
-                    "mixHash" : "b242e4c62620d82331e5854acd4fa161174568586ac534bad1721e61204a7b6b",
-                    "nonce" : "c47b419e7503ca79",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b242e4c62620d82331e5854acd4fa161174568586ac534bad1721e61204a7b6b88c47b419e7503ca79c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0e7f13f4408a7c40943c26b14e555144b2f4d3c44df87c746a1f5d5f4d261a50",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "f3639efa17ff682a3b924483fa297fea8e0563b25218b61a8b446dd774279530",
-                    "mixHash" : "86a86dcbbd3a0099b95af2a2d9508b6085fc50251b51e360c0191acb58d845f8",
-                    "nonce" : "931e130460c0196e",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a086a86dcbbd3a0099b95af2a2d9508b6085fc50251b51e360c0191acb58d845f888931e130460c0196ec0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f3639efa17ff682a3b924483fa297fea8e0563b25218b61a8b446dd774279530",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g1v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "7a7be29c8b821dd0ce13212a1eb3c2c89edc3c961a8d80f216e2837bb094f15b",
-                    "mixHash" : "206288a420d928d925e89d6362adae25a05a9eebac12932cba330865890d9cc0",
-                    "nonce" : "f434dfefc46a0357",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
-                    "stateRoot" : "91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0206288a420d928d925e89d6362adae25a05a9eebac12932cba330865890d9cc088f434dfefc46a0357f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7a7be29c8b821dd0ce13212a1eb3c2c89edc3c961a8d80f216e2837bb094f15b",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g1v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "a8f71e104039cbb4754d8d2c3d7876000ff3b42ad9aff97bdeaf63ae19de9b58",
-                    "mixHash" : "2e9654c814a793532d0447e327edaee83308f5583883a958a74f127b137da020",
-                    "nonce" : "45d70f8c37ebbe33",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
-                    "stateRoot" : "91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a02e9654c814a793532d0447e327edaee83308f5583883a958a74f127b137da0208845d70f8c37ebbe33f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a8f71e104039cbb4754d8d2c3d7876000ff3b42ad9aff97bdeaf63ae19de9b58",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g1v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "35f212f914f725f6a93d77b154d9a804a903e54c8f41ae69539e24d9c9acfafc",
-                    "mixHash" : "1a5f2c0c745648b61f91340007ec3dfaf70bf3c7b4e44fb0da5bf44db223b291",
-                    "nonce" : "4a88e7dac2d782c1",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
-                    "stateRoot" : "40714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a01a5f2c0c745648b61f91340007ec3dfaf70bf3c7b4e44fb0da5bf44db223b291884a88e7dac2d782c1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "35f212f914f725f6a93d77b154d9a804a903e54c8f41ae69539e24d9c9acfafc",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g1v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "8553b0070164a6bdbdb8de50377e846c6fda463efc56cfb01ee9ee128891d49f",
-                    "mixHash" : "eb1bf1ff2cd937a67776009c53d7a33048793237ed97bb7af72543b78aed9160",
-                    "nonce" : "ba7c13cdf4af925f",
-                    "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
-                    "stateRoot" : "91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0eb1bf1ff2cd937a67776009c53d7a33048793237ed97bb7af72543b78aed916088ba7c13cdf4af925ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8553b0070164a6bdbdb8de50377e846c6fda463efc56cfb01ee9ee128891d49f",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
deleted file mode 100644
index fd83d7d11..000000000
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-    "callOutput3Fail_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "cafe9125c511599129dd9e669c5f1cf19d7d47fcef10fc032ba201379979102e",
-                    "mixHash" : "f9b231ff77bdf2c6cf8a05756a1fb71ced136893a9a0fa1aae82f48a1695dd81",
-                    "nonce" : "92172802c88ff4d4",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f9b231ff77bdf2c6cf8a05756a1fb71ced136893a9a0fa1aae82f48a1695dd818892172802c88ff4d4c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cafe9125c511599129dd9e669c5f1cf19d7d47fcef10fc032ba201379979102e",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "3a55308ea2154a464d4a54d6209d497e1e2f606773e9d94cef5d6e22c54cb5e2",
-                    "mixHash" : "573c7973dbd2b5bb3af5ee3639ba173015bab48b4cf48906f304ab39dfae88c7",
-                    "nonce" : "7e604f2556cdb957",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0573c7973dbd2b5bb3af5ee3639ba173015bab48b4cf48906f304ab39dfae88c7887e604f2556cdb957c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3a55308ea2154a464d4a54d6209d497e1e2f606773e9d94cef5d6e22c54cb5e2",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "46ea9eede656cd2a405969f9a1ef966dc1c3c46069a3310d21dcb54d00117782",
-                    "mixHash" : "adab095466c5fb9182c452ce245d66c914625c91fee2fec397f25a736ef92cc4",
-                    "nonce" : "0bd95e128ddab443",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0adab095466c5fb9182c452ce245d66c914625c91fee2fec397f25a736ef92cc4880bd95e128ddab443c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "46ea9eede656cd2a405969f9a1ef966dc1c3c46069a3310d21dcb54d00117782",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "458b72cb1f01b105410595d7cfbd74ef3e0c6c57a73e8ec619d016709f30f614",
-                    "mixHash" : "f537b91a2a96e8e5aca6a6eb62f33ccf33918ee47a00a74107538c37323d0926",
-                    "nonce" : "82535ab9867a88aa",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f537b91a2a96e8e5aca6a6eb62f33ccf33918ee47a00a74107538c37323d09268882535ab9867a88aac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "458b72cb1f01b105410595d7cfbd74ef3e0c6c57a73e8ec619d016709f30f614",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g1v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "bb4da0b08ed817fb0c74b7b20b4561264df25ed27ff583c298ba4f4ac4cb7ee6",
-                    "mixHash" : "f3120bf4322a8f58cdf5ea4e0f7291d724ce45e6385dc2135db77530a859c5cb",
-                    "nonce" : "62287f5885c14e51",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
-                    "stateRoot" : "dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0f3120bf4322a8f58cdf5ea4e0f7291d724ce45e6385dc2135db77530a859c5cb8862287f5885c14e51f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bb4da0b08ed817fb0c74b7b20b4561264df25ed27ff583c298ba4f4ac4cb7ee6",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g1v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "2c4cac49fe680b74fc80d1a5a9d144a080d8b18eb113cfbfdf9fa1e1c404c149",
-                    "mixHash" : "e193513233f331398aae88d11f95a4f9b3b505538c070cc373fddcdf74aee3c8",
-                    "nonce" : "56ab340fd019258b",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
-                    "stateRoot" : "dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0e193513233f331398aae88d11f95a4f9b3b505538c070cc373fddcdf74aee3c88856ab340fd019258bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2c4cac49fe680b74fc80d1a5a9d144a080d8b18eb113cfbfdf9fa1e1c404c149",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g1v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "4593e6d42c95b4cfe26dccf14e966665ccc63ac114ca477a410c70bed214f423",
-                    "mixHash" : "c29ac28316a2ca7fc4971b6319dac37b994981f2d246d24b410ca4d6d96f72ce",
-                    "nonce" : "c446bc9e526b3167",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
-                    "stateRoot" : "77422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0c29ac28316a2ca7fc4971b6319dac37b994981f2d246d24b410ca4d6d96f72ce88c446bc9e526b3167f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4593e6d42c95b4cfe26dccf14e966665ccc63ac114ca477a410c70bed214f423",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g1v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163c9",
-                    "hash" : "e8ebb410111741ece1ebecd2a1909d3af02b63621c983492b3707a9d84e464e8",
-                    "mixHash" : "a1fff4068ccd1ed3e15f0d42a97093529347d63da1b0b2e46e2e01ab723b0289",
-                    "nonce" : "30f4101eea4674bf",
-                    "number" : "0x01",
-                    "parentHash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
-                    "stateRoot" : "dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0a1fff4068ccd1ed3e15f0d42a97093529347d63da1b0b2e46e2e01ab723b02898830f4101eea4674bff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e8ebb410111741ece1ebecd2a1909d3af02b63621c983492b3707a9d84e464e8",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
new file mode 100644
index 000000000..a471d4c0f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
@@ -0,0 +1,549 @@
+{
+    "callOutput3Fail_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xda81072b40c38ae26e3b5861f83b75c36c1e24254b9ee1780aa963ab771c06ec",
+                    "mixHash" : "0x3883d9f00507d9cb290f87ab82169d5c47b8bc602b757ce027d767c01a74655f",
+                    "nonce" : "0x07256691ad3889ea",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03883d9f00507d9cb290f87ab82169d5c47b8bc602b757ce027d767c01a74655f8807256691ad3889eac0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xda81072b40c38ae26e3b5861f83b75c36c1e24254b9ee1780aa963ab771c06ec",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xf2e9fd310da15de1b1ffcd233030b33b6865b95ac51a55edb5fc67264d25fb64",
+                    "mixHash" : "0x6d77c7ec9fb2b9066a74fae211b0864fbc006bef66e8bae9242b1d1da1416f06",
+                    "nonce" : "0x02b58f85c998bdaa",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06d77c7ec9fb2b9066a74fae211b0864fbc006bef66e8bae9242b1d1da1416f068802b58f85c998bdaac0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf2e9fd310da15de1b1ffcd233030b33b6865b95ac51a55edb5fc67264d25fb64",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x2aa6560dd76e992a78a15d1e69db1b7c0b29af17cfad385951617d309bf45da0",
+                    "mixHash" : "0x3f6bc1903bff8010f1d314b790b0ab4d838009287662ff9ea7ccd0ca4ef1171e",
+                    "nonce" : "0x4a09272ea3c514a8",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03f6bc1903bff8010f1d314b790b0ab4d838009287662ff9ea7ccd0ca4ef1171e884a09272ea3c514a8c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2aa6560dd76e992a78a15d1e69db1b7c0b29af17cfad385951617d309bf45da0",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x41e91af2cccfa9840193a723e81467414bcf4f72a17290ac00d92256e49826a0",
+                    "mixHash" : "0x5d3a750093d65986185e0ac61bfb7638dafed997e8f47b5daa8f4a979aaef062",
+                    "nonce" : "0xc12cf814e84722c1",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05d3a750093d65986185e0ac61bfb7638dafed997e8f47b5daa8f4a979aaef06288c12cf814e84722c1c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x41e91af2cccfa9840193a723e81467414bcf4f72a17290ac00d92256e49826a0",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xe5bc225be38fe0540474ace115f7e7665f6f8ebd63355e246fda21318f3fc838",
+                    "mixHash" : "0xec6d3bb2061c94a7958c234553ec9ee2aa4ec510a000aad42465f86d6e16d601",
+                    "nonce" : "0xa71b0ffc6baea4a4",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x5a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ec6d3bb2061c94a7958c234553ec9ee2aa4ec510a000aad42465f86d6e16d60188a71b0ffc6baea4a4c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe5bc225be38fe0540474ace115f7e7665f6f8ebd63355e246fda21318f3fc838",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
new file mode 100644
index 000000000..ae798d158
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
@@ -0,0 +1,608 @@
+{
+    "callOutput3Fail_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0x70d0a4bb11e2e21cb407c7d22084ea82397e37f67726b2966428a6242a6b9ff5",
+                    "mixHash" : "0x627f377a4364838aca27f92f64f3955576239e91c24446c2c95236a6a6bdd0ef",
+                    "nonce" : "0xc0883c3b982ab17e",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
+                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0627f377a4364838aca27f92f64f3955576239e91c24446c2c95236a6a6bdd0ef88c0883c3b982ab17ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70d0a4bb11e2e21cb407c7d22084ea82397e37f67726b2966428a6242a6b9ff5",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0x1a49fe3d12b757ae4fb0793a67eca579a3ece3f1af1eb91a0918ef61921f44bb",
+                    "mixHash" : "0x1771c5442f3d66af904cabc50a05c9b16d62532ab43bf254e745d553ef3fdfbf",
+                    "nonce" : "0xaf3b66ecde783853",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
+                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a01771c5442f3d66af904cabc50a05c9b16d62532ab43bf254e745d553ef3fdfbf88af3b66ecde783853f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1a49fe3d12b757ae4fb0793a67eca579a3ece3f1af1eb91a0918ef61921f44bb",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0xafa61e0f1f8ebf615abdebc01c6a27e7a70ed227b12c19eb7da6ae467e9a240e",
+                    "mixHash" : "0x971730924af96beeb4bf05c1caa0c10abb6ea55e1e6fa3233f65a17af6ddc70a",
+                    "nonce" : "0x41b7716fe82f60f1",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0xba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
+                    "stateRoot" : "0x77422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0971730924af96beeb4bf05c1caa0c10abb6ea55e1e6fa3233f65a17af6ddc70a8841b7716fe82f60f1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xafa61e0f1f8ebf615abdebc01c6a27e7a70ed227b12c19eb7da6ae467e9a240e",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0163c9",
+                    "hash" : "0xa95a7f5606f0cb1a0c5d1fdd1ef595c5323144f8cfea93c84c6bd51beb8e15c8",
+                    "mixHash" : "0x5ca3fe1f05cf8c1fb176efc07b2fec1cf925c4ffb4dde5193a07face55ada433",
+                    "nonce" : "0x307ac9ef5219f0f4",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
+                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a05ca3fe1f05cf8c1fb176efc07b2fec1cf925c4ffb4dde5193a07face55ada43388307ac9ef5219f0f4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa95a7f5606f0cb1a0c5d1fdd1ef595c5323144f8cfea93c84c6bd51beb8e15c8",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0xbbc1f140ec443e3e30a75e239cb5fd671043135b5a4780bae7d131558a68a3ee",
+                    "mixHash" : "0x597779bbed90eede1d43a99b2148b919cd660a805e6473844268b2d49af70459",
+                    "nonce" : "0xa998895d7778e82e",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
+                    "stateRoot" : "0x94df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0597779bbed90eede1d43a99b2148b919cd660a805e6473844268b2d49af7045988a998895d7778e82ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbbc1f140ec443e3e30a75e239cb5fd671043135b5a4780bae7d131558a68a3ee",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
new file mode 100644
index 000000000..eef14bb93
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
@@ -0,0 +1,549 @@
+{
+    "callOutput3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x257eca08bb19a7be3b306a1f5a189d63b2e7b674ab3e000712ab07a9ead8a0f1",
+                    "mixHash" : "0xc0dda0658427580ba8b69cfe7b89ec0518e67db6a8c9ffa5efe7c7e5ba06e034",
+                    "nonce" : "0x40bb4cb3b8330eb8",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c0dda0658427580ba8b69cfe7b89ec0518e67db6a8c9ffa5efe7c7e5ba06e0348840bb4cb3b8330eb8c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x257eca08bb19a7be3b306a1f5a189d63b2e7b674ab3e000712ab07a9ead8a0f1",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x5680318d305c6c60f494537f98d11d70c8b3b9e06425ec987aa1e10a7ea58999",
+                    "mixHash" : "0x1cb101c367b098ec1c3b550a1d8bd33b714828b44d252f41b4dde2e0009bf224",
+                    "nonce" : "0xcb54d275272c6739",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01cb101c367b098ec1c3b550a1d8bd33b714828b44d252f41b4dde2e0009bf22488cb54d275272c6739c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5680318d305c6c60f494537f98d11d70c8b3b9e06425ec987aa1e10a7ea58999",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x5141f6bb607c41182c77a775f51b681af48023085aacb48e9d0c50d688424d9b",
+                    "mixHash" : "0x9276ea9bbd7a8ae274072db35615ca900026ce8653c90c0350354673ddc39d97",
+                    "nonce" : "0x007d302aa1e11870",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09276ea9bbd7a8ae274072db35615ca900026ce8653c90c0350354673ddc39d9788007d302aa1e11870c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5141f6bb607c41182c77a775f51b681af48023085aacb48e9d0c50d688424d9b",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xc41ddc56e435db34fad584ca72851f058047580b599c0c8a68ace8f69181cc18",
+                    "mixHash" : "0xfdde23a12df7957e545bca762f8058f7d1a5d34beab96d14d1962bcc49f64e19",
+                    "nonce" : "0xb58eb1e124b35b3c",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fdde23a12df7957e545bca762f8058f7d1a5d34beab96d14d1962bcc49f64e1988b58eb1e124b35b3cc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc41ddc56e435db34fad584ca72851f058047580b599c0c8a68ace8f69181cc18",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x050c430ee8463d6d79473c8ef3cf75df2d37d8993e2a5aedaf470f94b107f205",
+                    "mixHash" : "0xba57a36c05fada0dcd11d896c0cb317c9ac5cb8a871cc62a8ac725721a9cfaea",
+                    "nonce" : "0x3fa2ce3cde87dd01",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ba57a36c05fada0dcd11d896c0cb317c9ac5cb8a871cc62a8ac725721a9cfaea883fa2ce3cde87dd01c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x050c430ee8463d6d79473c8ef3cf75df2d37d8993e2a5aedaf470f94b107f205",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
new file mode 100644
index 000000000..c3003cba3
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
@@ -0,0 +1,608 @@
+{
+    "callOutput3_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0xdc9dca55184d4aa34ff208fde601c7db3ad5bbca4880d6b0c793b56c8476bf3a",
+                    "mixHash" : "0x93b4495f83a49e4ee7f5028480da90724b1bd0dc96fd02ec91f38d5c3d06a99a",
+                    "nonce" : "0xc404a106294904aa",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
+                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a093b4495f83a49e4ee7f5028480da90724b1bd0dc96fd02ec91f38d5c3d06a99a88c404a106294904aaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc9dca55184d4aa34ff208fde601c7db3ad5bbca4880d6b0c793b56c8476bf3a",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x67cc8829a1cb1953d4c159c71fa1a967733d663efcba9141b697d9832ffa7c4e",
+                    "mixHash" : "0xff7b117e81ade86555926022a3e6b8ef6cbbe0c7a7eb2a449cb1b5b15f9cf90f",
+                    "nonce" : "0x51e9fddb277b3d4e",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
+                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0ff7b117e81ade86555926022a3e6b8ef6cbbe0c7a7eb2a449cb1b5b15f9cf90f8851e9fddb277b3d4ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67cc8829a1cb1953d4c159c71fa1a967733d663efcba9141b697d9832ffa7c4e",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x5dd422f4f422e1f5fb34d79325e895a4fd69b0802f076142eb233fea74f37af7",
+                    "mixHash" : "0xaf803072466b1624c9a8c355b1549e9124bc791c9fac458b4eaeedf9c26db131",
+                    "nonce" : "0x9c01035259a0fb27",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
+                    "stateRoot" : "0x40714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0af803072466b1624c9a8c355b1549e9124bc791c9fac458b4eaeedf9c26db131889c01035259a0fb27f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5dd422f4f422e1f5fb34d79325e895a4fd69b0802f076142eb233fea74f37af7",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x91ad8645ea2031cc418d6ff94198683e0c39f950914e101f3e859f6000a21c1a",
+                    "mixHash" : "0x5f51e36dcb6d4b002850841bb783a4e83927d2fa17c290d2fc210ac9c233b8f8",
+                    "nonce" : "0x30aebf351a9d7250",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0xf25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
+                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a05f51e36dcb6d4b002850841bb783a4e83927d2fa17c290d2fc210ac9c233b8f88830aebf351a9d7250f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x91ad8645ea2031cc418d6ff94198683e0c39f950914e101f3e859f6000a21c1a",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0xf89de737022044dae49e770a79e1d97d34f72dcf4bd5b270271adde22d3acc05",
+                    "mixHash" : "0x70332010ff2b5b3e337fbfdcc46579dfd2dde41505a50fb7b5227c704be27c06",
+                    "nonce" : "0xc8e7d0eac5c85b87",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a070332010ff2b5b3e337fbfdcc46579dfd2dde41505a50fb7b5227c704be27c0688c8e7d0eac5c85b87f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf89de737022044dae49e770a79e1d97d34f72dcf4bd5b270271adde22d3acc05",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
deleted file mode 100644
index 4db644a48..000000000
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-    "callOutput3partial_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "b1edfe4c6256b4020790d7b956f5a96bba55e93b17785bac4fa87da23797dcd6",
-                    "mixHash" : "35347047355db36700767a50f5074ec9276329618b6df400b7dbd12843215859",
-                    "nonce" : "539da6466e56788a",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035347047355db36700767a50f5074ec9276329618b6df400b7dbd1284321585988539da6466e56788ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b1edfe4c6256b4020790d7b956f5a96bba55e93b17785bac4fa87da23797dcd6",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "d16ffa37d491eda168b1915559c47df5374d47ced20312a3ff838a4c57ee15b6",
-                    "mixHash" : "4a5772f18433d3f435f64d3940ed999de38b894988b3bd54ab1aa17edf16df17",
-                    "nonce" : "b250d2cb072c0213",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04a5772f18433d3f435f64d3940ed999de38b894988b3bd54ab1aa17edf16df1788b250d2cb072c0213c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d16ffa37d491eda168b1915559c47df5374d47ced20312a3ff838a4c57ee15b6",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "6d37c1b6faef10e1fd6c634ae1d27a01bfc165b36aaeddd914d47d1652f80ebc",
-                    "mixHash" : "d0d5b6cda5a69fc1e71e0f89a0746fee4c323bab32b7391a62547a43dc2f199d",
-                    "nonce" : "5761ea76b8e5b9ed",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d0d5b6cda5a69fc1e71e0f89a0746fee4c323bab32b7391a62547a43dc2f199d885761ea76b8e5b9edc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6d37c1b6faef10e1fd6c634ae1d27a01bfc165b36aaeddd914d47d1652f80ebc",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "322f1075930698c8afec17b48fee801ba42a36d1f9b3366d77cfac95eae41d31",
-                    "mixHash" : "f8080b5153792b95f617239320d5f1f58c3e1cab53115a6c52fde47282500ba1",
-                    "nonce" : "7940e5c42002924d",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f8080b5153792b95f617239320d5f1f58c3e1cab53115a6c52fde47282500ba1887940e5c42002924dc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "322f1075930698c8afec17b48fee801ba42a36d1f9b3366d77cfac95eae41d31",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g1v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "ed3fb0b600f675df7021c1387f17c0fcdcce8cdcd4977b63b307808fd690c874",
-                    "mixHash" : "9bf6ab863bfa2e78739654e045031be0fc40257a0dd907f6282a758b295b39f0",
-                    "nonce" : "df076e9ea121acc7",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
-                    "stateRoot" : "380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a09bf6ab863bfa2e78739654e045031be0fc40257a0dd907f6282a758b295b39f088df076e9ea121acc7f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ed3fb0b600f675df7021c1387f17c0fcdcce8cdcd4977b63b307808fd690c874",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g1v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "891430477d37fc573bf1bfce0d547940051aa05ef3bd6e2d4378f393807fcc72",
-                    "mixHash" : "edb405beb70047274f520e3c3714873c43b82787b9c6a3ba402c32856c74fc40",
-                    "nonce" : "2972c5b8e969fbdd",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
-                    "stateRoot" : "380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0edb405beb70047274f520e3c3714873c43b82787b9c6a3ba402c32856c74fc40882972c5b8e969fbddf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "891430477d37fc573bf1bfce0d547940051aa05ef3bd6e2d4378f393807fcc72",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g1v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "522f390b8773afeccd50eafcc5ae5828628d0bbb0795c24f91ad264199b7a9b2",
-                    "mixHash" : "75089c111e9417933d55b72f0b525116dd52df31e28f948b584940b4e4771151",
-                    "nonce" : "6a42e2f483babcd6",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
-                    "stateRoot" : "b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a075089c111e9417933d55b72f0b525116dd52df31e28f948b584940b4e4771151886a42e2f483babcd6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "522f390b8773afeccd50eafcc5ae5828628d0bbb0795c24f91ad264199b7a9b2",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g1v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "21b8160e8c72c2f86adeb82158a3c4ac8afeb580b6fd61090104ffb974331b15",
-                    "mixHash" : "76ecd45cb31aa73c822b30b239fd2629f1f50ac328c8be433c4bc920babd9f42",
-                    "nonce" : "bd6fc5aa85695a6a",
-                    "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
-                    "stateRoot" : "380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a076ecd45cb31aa73c822b30b239fd2629f1f50ac328c8be433c4bc920babd9f4288bd6fc5aa85695a6af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "21b8160e8c72c2f86adeb82158a3c4ac8afeb580b6fd61090104ffb974331b15",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
deleted file mode 100644
index 0bd617e90..000000000
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-    "callOutput3partialFail_d0g0v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "fe4367736ec3074649e8a50e1e1bc2bfe6e1d059b5db38123a0d70806d06da55",
-                    "mixHash" : "767d275e96adfdb3b3d8150bf9c26a1240bef07e93162cdf7b5118a8533c567d",
-                    "nonce" : "15758a91aa9a0d3d",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0767d275e96adfdb3b3d8150bf9c26a1240bef07e93162cdf7b5118a8533c567d8815758a91aa9a0d3dc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fe4367736ec3074649e8a50e1e1bc2bfe6e1d059b5db38123a0d70806d06da55",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g0v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "ea00608282ecf9337e43b209a411081cc3e8c9b31a55c85c294e63190de91043",
-                    "mixHash" : "10f1a30b38682f5dd7576fc177e6bdd80de0c071468511c08db3177b2ed406c7",
-                    "nonce" : "f1e3d0a5468d7656",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a010f1a30b38682f5dd7576fc177e6bdd80de0c071468511c08db3177b2ed406c788f1e3d0a5468d7656c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ea00608282ecf9337e43b209a411081cc3e8c9b31a55c85c294e63190de91043",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g0v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "3832065243e40bc40bb38072261ebe669eb43c70ce7c0fb7f31ac4e80baf2d00",
-                    "mixHash" : "9ef87856146ef175aa33be5857f331726c93e2646e5568bf04cfadc355241705",
-                    "nonce" : "79c8f8afb3c1ed0b",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09ef87856146ef175aa33be5857f331726c93e2646e5568bf04cfadc3552417058879c8f8afb3c1ed0bc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3832065243e40bc40bb38072261ebe669eb43c70ce7c0fb7f31ac4e80baf2d00",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g0v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "c1357085c398d4d789a51bc921962bd79ed2ded96e45ada241626dd3efec2a92",
-                    "mixHash" : "94afa78c5f111eb0053ab033b32ac7fc5976d118e93fed84a9d69a5be058b49a",
-                    "nonce" : "29da050b9c6434d6",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a094afa78c5f111eb0053ab033b32ac7fc5976d118e93fed84a9d69a5be058b49a8829da050b9c6434d6c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c1357085c398d4d789a51bc921962bd79ed2ded96e45ada241626dd3efec2a92",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g1v0_EIP150" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "b3f45c9ae3d7da029e2a0d3fe5eb07dbddb2248af5e9fad67c576304275ae931",
-                    "mixHash" : "5b05822e59390eb2c525bc997fa079a7f3d32077c661a13f22cf4a37bb56692f",
-                    "nonce" : "3985a1d87468a49e",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
-                    "stateRoot" : "470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a05b05822e59390eb2c525bc997fa079a7f3d32077c661a13f22cf4a37bb56692f883985a1d87468a49ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b3f45c9ae3d7da029e2a0d3fe5eb07dbddb2248af5e9fad67c576304275ae931",
-        "network" : "EIP150",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g1v0_EIP158" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "4ffea4fb0c326383fafe1d1d4a9180505be02dce7c4e832853b2a0fd07384439",
-                    "mixHash" : "7cb6ab7bacaa554f779de1d599467f3b14bcb507faba815a88cd1d835dde28d1",
-                    "nonce" : "692f8a6fdedc3a44",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
-                    "stateRoot" : "470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a07cb6ab7bacaa554f779de1d599467f3b14bcb507faba815a88cd1d835dde28d188692f8a6fdedc3a44f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4ffea4fb0c326383fafe1d1d4a9180505be02dce7c4e832853b2a0fd07384439",
-        "network" : "EIP158",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g1v0_Frontier" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "3aa39dc4575ee38fe352cf5c8f7ef97e6dc362e87df2a650431a420e01dbcd88",
-                    "mixHash" : "10ccf800f8ec4d5d5a202048730b968b4bf44c7bed8147073e97c2ff09fa6784",
-                    "nonce" : "4e4ea47173364247",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
-                    "stateRoot" : "f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a010ccf800f8ec4d5d5a202048730b968b4bf44c7bed8147073e97c2ff09fa6784884e4ea47173364247f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3aa39dc4575ee38fe352cf5c8f7ef97e6dc362e87df2a650431a420e01dbcd88",
-        "network" : "Frontier",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g1v0_Homestead" : {
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "0x",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163c9",
-                    "hash" : "290a6e6fc4f5832a2e17b06333d2c1c87b9a40eb9a4362c7a7785d090d1d6295",
-                    "mixHash" : "8338a13ab84ef2cb0df3110347e2dd9c7b4319f74ae842541787ffaeae0abb54",
-                    "nonce" : "db08e0774a0c629f",
-                    "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
-                    "stateRoot" : "470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a08338a13ab84ef2cb0df3110347e2dd9c7b4319f74ae842541787ffaeae0abb5488db08e0774a0c629ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "290a6e6fc4f5832a2e17b06333d2c1c87b9a40eb9a4362c7a7785d090d1d6295",
-        "network" : "Homestead",
-        "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "0x",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
new file mode 100644
index 000000000..f3c10df0b
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
@@ -0,0 +1,549 @@
+{
+    "callOutput3partialFail_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x62a0f6b37f64a78a93fae1116d502758d55e9e8cd72d49d76a86a6c8d49a3c9d",
+                    "mixHash" : "0xbc2faf23c79d4e3a4e9d3afd58cb63ff9389916cba4ce9533348e10fde5cac24",
+                    "nonce" : "0x03691c5e4a09e2c6",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bc2faf23c79d4e3a4e9d3afd58cb63ff9389916cba4ce9533348e10fde5cac248803691c5e4a09e2c6c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x62a0f6b37f64a78a93fae1116d502758d55e9e8cd72d49d76a86a6c8d49a3c9d",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xd4b30bdc669ea45a2f3746e93732f4261e84133b91fc234770d27244c60831ad",
+                    "mixHash" : "0x6899b09d493d726e5338ec10aef45461bd9893a2330c2cdf31eeba81b78d2aa7",
+                    "nonce" : "0x2ee2d1058aca7df3",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06899b09d493d726e5338ec10aef45461bd9893a2330c2cdf31eeba81b78d2aa7882ee2d1058aca7df3c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd4b30bdc669ea45a2f3746e93732f4261e84133b91fc234770d27244c60831ad",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xceb071d1e689334c58906530477adb8aaf11fa9adbc8b3be30b1b0f9daa4b56f",
+                    "mixHash" : "0x7014bbaa8b8ebe0cd811db3c16d75684eee80876cae609cf3398ca728bdfd93d",
+                    "nonce" : "0xc79d78894b8a9059",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07014bbaa8b8ebe0cd811db3c16d75684eee80876cae609cf3398ca728bdfd93d88c79d78894b8a9059c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xceb071d1e689334c58906530477adb8aaf11fa9adbc8b3be30b1b0f9daa4b56f",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x8bcdbd1b6a6987d318d8b7e24c9cee7727bde597211f33a3c65054618a851777",
+                    "mixHash" : "0x07559de5f2f3987b70a6841743f3956896253d3fef331eb5dd2d1608802ff2a8",
+                    "nonce" : "0x88ad962471820136",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a007559de5f2f3987b70a6841743f3956896253d3fef331eb5dd2d1608802ff2a88888ad962471820136c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8bcdbd1b6a6987d318d8b7e24c9cee7727bde597211f33a3c65054618a851777",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x4f97f1c734fbda73f059790e708b17be8beed85e458b242536e5e56af9e40b58",
+                    "mixHash" : "0x711a25a80805d9b7f1664e78035fcc068d26d66ae652b05c5df7a35806a6e03c",
+                    "nonce" : "0x1060e21c8ef4c4a7",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0711a25a80805d9b7f1664e78035fcc068d26d66ae652b05c5df7a35806a6e03c881060e21c8ef4c4a7c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f97f1c734fbda73f059790e708b17be8beed85e458b242536e5e56af9e40b58",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
new file mode 100644
index 000000000..2b6e03de0
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
@@ -0,0 +1,608 @@
+{
+    "callOutput3partialFail_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0x1c92fc02992aae8d97055b5b43603a4b739064c6a701e4818fe19046a3283096",
+                    "mixHash" : "0x01bc6c5af45f6a787422d87ed5253f4faa4220698362d6213efb364f6ec606b9",
+                    "nonce" : "0x1e029e1ee6d6be0f",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
+                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a001bc6c5af45f6a787422d87ed5253f4faa4220698362d6213efb364f6ec606b9881e029e1ee6d6be0ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1c92fc02992aae8d97055b5b43603a4b739064c6a701e4818fe19046a3283096",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0x65dceb0537b750ca3c5214af3b247d9f75e76cd2243b3f482552f6ce4bdf2c69",
+                    "mixHash" : "0x6d07ad34a7661398f2915d62d78ae0805721bd6df25864c25a09353ec2f26662",
+                    "nonce" : "0xae7ee824feff849a",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
+                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a06d07ad34a7661398f2915d62d78ae0805721bd6df25864c25a09353ec2f2666288ae7ee824feff849af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x65dceb0537b750ca3c5214af3b247d9f75e76cd2243b3f482552f6ce4bdf2c69",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x7355f3146bf9abadaf619e41165b18731bc2ed42611e54efd4ac9653289c4432",
+                    "mixHash" : "0xe1ed36351713288d615111a82bac210812acaf0c7f601fc219b83404f46ff97d",
+                    "nonce" : "0x6b8b882d09640caa",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
+                    "stateRoot" : "0xf28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0e1ed36351713288d615111a82bac210812acaf0c7f601fc219b83404f46ff97d886b8b882d09640caaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7355f3146bf9abadaf619e41165b18731bc2ed42611e54efd4ac9653289c4432",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0163c9",
+                    "hash" : "0x0e8e9ce7b6c56e1ae5d9a53ffe4751b1e32b897c28640cc6c73b23a194219e17",
+                    "mixHash" : "0x56f74fae9c04ccdf9e55300fe8418d1d82b8607cc3650ea4242f522703d755fa",
+                    "nonce" : "0x767084f41b8eff08",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
+                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a056f74fae9c04ccdf9e55300fe8418d1d82b8607cc3650ea4242f522703d755fa88767084f41b8eff08f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0e8e9ce7b6c56e1ae5d9a53ffe4751b1e32b897c28640cc6c73b23a194219e17",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0xc370e419d7333dd1cb5c4558fab3d3f9de5615e06207b9de96c1da0a1bc643a2",
+                    "mixHash" : "0x1dc7e12439dc54b7bfe9099e8e03bc4e00998b9d37d5b165d23b1806589481fa",
+                    "nonce" : "0x5c558c773cc7d7b0",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
+                    "stateRoot" : "0x5a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a01dc7e12439dc54b7bfe9099e8e03bc4e00998b9d37d5b165d23b1806589481fa885c558c773cc7d7b0f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc370e419d7333dd1cb5c4558fab3d3f9de5615e06207b9de96c1da0a1bc643a2",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
new file mode 100644
index 000000000..32c0cc66b
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
@@ -0,0 +1,549 @@
+{
+    "callOutput3partial_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x676cd1e7455b9ba306ef301b7687bad3114094c519d445b7312f97db0858c7b1",
+                    "mixHash" : "0x76949db66247718969b88accfa215d7a917c150a5fd66a5d7dadd6837eb922f4",
+                    "nonce" : "0x44cfb8c73368fcc3",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a076949db66247718969b88accfa215d7a917c150a5fd66a5d7dadd6837eb922f48844cfb8c73368fcc3c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x676cd1e7455b9ba306ef301b7687bad3114094c519d445b7312f97db0858c7b1",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xa5775876266b8cfb8de1d82be638d170b81d50adee2cd0e314dc63750075b5c8",
+                    "mixHash" : "0x70bee2eb119c9cf2522af54e1be3de57abcf4c68616a3762a839e5b3961ba51b",
+                    "nonce" : "0x749d2e2b1422a451",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a070bee2eb119c9cf2522af54e1be3de57abcf4c68616a3762a839e5b3961ba51b88749d2e2b1422a451c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa5775876266b8cfb8de1d82be638d170b81d50adee2cd0e314dc63750075b5c8",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xa427dc9da03e444fec838b80175fecd824124bd56a723f15eb8eee6e85df4974",
+                    "mixHash" : "0xd72c0c3b3a92f8bf31c61559adf35172c7f1de910f4692ed6ce500f4524fe25f",
+                    "nonce" : "0x7ad8cafb49d82e99",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d72c0c3b3a92f8bf31c61559adf35172c7f1de910f4692ed6ce500f4524fe25f887ad8cafb49d82e99c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa427dc9da03e444fec838b80175fecd824124bd56a723f15eb8eee6e85df4974",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x6251270046434d33f06418f0298ebb6c1250bc2d6c44e752a99efb2258b30409",
+                    "mixHash" : "0x0d7caaebdce361b2b418e661a48289b05c80b98a871e49d109d5030924de8b1e",
+                    "nonce" : "0x6d39d001d80ea198",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00d7caaebdce361b2b418e661a48289b05c80b98a871e49d109d5030924de8b1e886d39d001d80ea198c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6251270046434d33f06418f0298ebb6c1250bc2d6c44e752a99efb2258b30409",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x3be11985b30f6acbd9b795dbeb8b35da8376ff4f1beadf432ad00120c63aa8c3",
+                    "mixHash" : "0x6266886699d3a76aed061ddcd77a091263d2797b1f886998b94af90446adaf0a",
+                    "nonce" : "0x527babe8253b5970",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06266886699d3a76aed061ddcd77a091263d2797b1f886998b94af90446adaf0a88527babe8253b5970c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3be11985b30f6acbd9b795dbeb8b35da8376ff4f1beadf432ad00120c63aa8c3",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
new file mode 100644
index 000000000..f35f4482f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
@@ -0,0 +1,608 @@
+{
+    "callOutput3partial_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x5f1f8669fd993579d2b1e4ef415c3d686376eea8e495720fd66e6ac8c4b0b15b",
+                    "mixHash" : "0x6b7686b29f2d0efd80c0c2894fa3d3b1d7c9e1136ed0aab9e9eae9a6ba076cbe",
+                    "nonce" : "0xd07975bab1bd2ad8",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
+                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a06b7686b29f2d0efd80c0c2894fa3d3b1d7c9e1136ed0aab9e9eae9a6ba076cbe88d07975bab1bd2ad8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5f1f8669fd993579d2b1e4ef415c3d686376eea8e495720fd66e6ac8c4b0b15b",
+        "network" : "EIP150",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0xdd2546003d7b8a552ee01e2e497db253f532f2728034de1bfa422a3c4dbba5d2",
+                    "mixHash" : "0x4aade4576cd8a2b2899bbbd1d99c1b652d05f5528fc6a12cedfb58d231088e38",
+                    "nonce" : "0xc4b7397ca74a0749",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
+                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a04aade4576cd8a2b2899bbbd1d99c1b652d05f5528fc6a12cedfb58d231088e3888c4b7397ca74a0749f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdd2546003d7b8a552ee01e2e497db253f532f2728034de1bfa422a3c4dbba5d2",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x4adbd8bee39505806328515794e87503511da948ab68799a0e9d4b7e873c8947",
+                    "mixHash" : "0x1f4bcd445980223bf81ca83178db5e7aa980d3b80c899b789c1aa098d2d02874",
+                    "nonce" : "0x77dd32e316c48423",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
+                    "stateRoot" : "0xb9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a01f4bcd445980223bf81ca83178db5e7aa980d3b80c899b789c1aa098d2d028748877dd32e316c48423f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4adbd8bee39505806328515794e87503511da948ab68799a0e9d4b7e873c8947",
+        "network" : "Frontier",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x6b76ea8758c016b3ce70f25ff8eb617f106c310a50d40c48c2e591d924bb2b3d",
+                    "mixHash" : "0xc9689ff5ecb119df3e236e8bbce1b57330f8cbcf30f0afb09d22a18863a6aaef",
+                    "nonce" : "0x9f9df8c72aeb04d1",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
+                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0c9689ff5ecb119df3e236e8bbce1b57330f8cbcf30f0afb09d22a18863a6aaef889f9df8c72aeb04d1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6b76ea8758c016b3ce70f25ff8eb617f106c310a50d40c48c2e591d924bb2b3d",
+        "network" : "Homestead",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x92c5c3d0067db9556ed71aa6d75a4d734d0023b59539617e78be99f2b71c61a5",
+                    "mixHash" : "0xe87313b0939e6bba8a49c7a86effe6e337036d5e79ddc17822d652a4cebe6cbb",
+                    "nonce" : "0xd2cb54582e1c4d95",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0x124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12ea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0e87313b0939e6bba8a49c7a86effe6e337036d5e79ddc17822d652a4cebe6cbb88d2cb54582e1c4d95f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x92c5c3d0067db9556ed71aa6d75a4d734d0023b59539617e78be99f2b71c61a5",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
index 60f5e774f..c257250c6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callWithHighValueAndGasOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "c1e31ce1f50dcac81798c68ba64d03843b1d31b43e46d8bbc06cbbb8a41b9bde",
-                    "mixHash" : "b615629ba6b3c5dbde13e6ec429d1523c96ff105548bd009498d15bec87a7cdf",
-                    "nonce" : "f879969d7453eec5",
+                    "hash" : "0xf49ed570fd55b617cc0b14c5be41607a2c637491e170eb30033c3b9afb6b3caf",
+                    "mixHash" : "0x1699cb60093d72657cd2a451ec24d357dfe5d5dd9f33e026e3791dd892f0481d",
+                    "nonce" : "0x1c772eaf7410f998",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
+                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0b615629ba6b3c5dbde13e6ec429d1523c96ff105548bd009498d15bec87a7cdf88f879969d7453eec5f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a01699cb60093d72657cd2a451ec24d357dfe5d5dd9f33e026e3791dd892f0481d881c772eaf7410f998f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c1e31ce1f50dcac81798c68ba64d03843b1d31b43e46d8bbc06cbbb8a41b9bde",
+        "lastblockhash" : "0xf49ed570fd55b617cc0b14c5be41607a2c637491e170eb30033c3b9afb6b3caf",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f149",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7618817",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "callWithHighValueAndGasOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "05b8c2668df37a0ed68629cbfc0bc2394e6829fe4d9ee848b882d63fc6c6e91e",
-                    "mixHash" : "fa54ba4a4b37644b2dbb1f94dce356428aed08546d0270d1312e2342020454ff",
-                    "nonce" : "82d8142847ddf0bb",
+                    "hash" : "0xf3f54b86fae01b3b2917a9fefab9f1fcd3334f705c77ab8003703ab0e196e5ea",
+                    "mixHash" : "0x75b425b96f1a34d91979c727cfb0a6c56ef1e74650fea54571a3290f4db5e293",
+                    "nonce" : "0x6b709f6298df0f85",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
+                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0fa54ba4a4b37644b2dbb1f94dce356428aed08546d0270d1312e2342020454ff8882d8142847ddf0bbf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a075b425b96f1a34d91979c727cfb0a6c56ef1e74650fea54571a3290f4db5e293886b709f6298df0f85f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "05b8c2668df37a0ed68629cbfc0bc2394e6829fe4d9ee848b882d63fc6c6e91e",
+        "lastblockhash" : "0xf3f54b86fae01b3b2917a9fefab9f1fcd3334f705c77ab8003703ab0e196e5ea",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f149",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7618817",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "callWithHighValueAndGasOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "372559d30fa9d2805a0f3763764ce26ee0d105aa462bed50c788794a7d80fc45",
-                    "mixHash" : "f99b808edb07c8e4e277981dbadb082d393dd768ecfb28f7ebe9d33b221a4c5c",
-                    "nonce" : "0a57ebc7b74673b4",
+                    "hash" : "0xececa1e5687a179f7211345fa0682e6249cb90905d020a8156451229debd8ee2",
+                    "mixHash" : "0x88c0f79de13151e3f32ee107a11b80c278aaae1e370408bfb67b6031b84c9f79",
+                    "nonce" : "0xf128ff7de7cf8704",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
+                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0f99b808edb07c8e4e277981dbadb082d393dd768ecfb28f7ebe9d33b221a4c5c880a57ebc7b74673b4f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a088c0f79de13151e3f32ee107a11b80c278aaae1e370408bfb67b6031b84c9f7988f128ff7de7cf8704f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "372559d30fa9d2805a0f3763764ce26ee0d105aa462bed50c788794a7d80fc45",
+        "lastblockhash" : "0xececa1e5687a179f7211345fa0682e6249cb90905d020a8156451229debd8ee2",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "48429bf7837b845eb2274a15d5d47e905b0c2ab7152e09ed5f33442d50e8566f",
-                    "mixHash" : "8aff406dbab41fab8d9e8d7e7defd17bec2a10a6836605d45294bf84cf4bfc00",
-                    "nonce" : "de65ab0d5fbca60e",
+                    "hash" : "0xa949326019f0356f05b0e5f86f8b6dbe1ce7b9155d33a8c76fc0009a2bbede72",
+                    "mixHash" : "0x218493f37a79bd7be2430fa2cb93f0b2fb3c37666f2cdc6340a9588e88c01bc0",
+                    "nonce" : "0x16aa174c9a600f7e",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
+                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08aff406dbab41fab8d9e8d7e7defd17bec2a10a6836605d45294bf84cf4bfc0088de65ab0d5fbca60ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0218493f37a79bd7be2430fa2cb93f0b2fb3c37666f2cdc6340a9588e88c01bc08816aa174c9a600f7ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -385,74 +405,202 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "48429bf7837b845eb2274a15d5d47e905b0c2ab7152e09ed5f33442d50e8566f",
+        "lastblockhash" : "0xa949326019f0356f05b0e5f86f8b6dbe1ce7b9155d33a8c76fc0009a2bbede72",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callWithHighValueAndGasOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0xd4545fed21fe6a5e96e757aa4506032b9c217a8b9286e52ac3fca2da85b4954a",
+                    "mixHash" : "0xecf71bfc10318ff11ddb0c68f0d6b203bab269dbe41174884aceede52f9f366c",
+                    "nonce" : "0x7b4e6ff6ff2fb951",
+                    "number" : "0x01",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0ecf71bfc10318ff11ddb0c68f0d6b203bab269dbe41174884aceede52f9f366c887b4e6ff6ff2fb951f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
+                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd4545fed21fe6a5e96e757aa4506032b9c217a8b9286e52ac3fca2da85b4954a",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
index e8676d761..3d9fe584b 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "callcodeOutput1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "a5e5aa50ff3d7fc2b5b5e9455581088b95c8c7d6359942f3bd9ff82c6da54262",
-                    "mixHash" : "356a2802460d896cd2f807f145f1428a249dbbbc8eb54663b75c1abe1f436013",
-                    "nonce" : "a1705772054631e5",
+                    "hash" : "0xacc5ff140abbedded72e81d7909ef1ff10f50800337d9de1c83edee29df1229f",
+                    "mixHash" : "0xd76b3649a049a098f4eafa1a3d989c5565e838f24951cf75053059011139cd7e",
+                    "nonce" : "0x4d1573696cd28eb5",
                     "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0356a2802460d896cd2f807f145f1428a249dbbbc8eb54663b75c1abe1f43601388a1705772054631e5c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d76b3649a049a098f4eafa1a3d989c5565e838f24951cf75053059011139cd7e884d1573696cd28eb5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,49 +33,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a5e5aa50ff3d7fc2b5b5e9455581088b95c8c7d6359942f3bd9ff82c6da54262",
+        "lastblockhash" : "0xacc5ff140abbedded72e81d7909ef1ff10f50800337d9de1c83edee29df1229f",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -79,21 +84,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -103,27 +108,32 @@
         }
     },
     "callcodeOutput1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "4fd1df7c2d7df9c88fb11f41f41cda334f9df8b95af137b7a04abf8f6c51ee44",
-                    "mixHash" : "59d212653bb3339fd60fad1b3036b1aa951540ac850e89846b1cdf04210bb183",
-                    "nonce" : "647a4931601dc108",
+                    "hash" : "0x95f97985e4df2b644020988a253915477a42f4ca45193cb26479ccdc040d4609",
+                    "mixHash" : "0xc7378cdf7e89d4e95c60ece338a82e30b5753fbd1ac49ffec3be830b0cc421e8",
+                    "nonce" : "0x4e9ac8ad28e2c7a5",
                     "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a059d212653bb3339fd60fad1b3036b1aa951540ac850e89846b1cdf04210bb18388647a4931601dc108c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c7378cdf7e89d4e95c60ece338a82e30b5753fbd1ac49ffec3be830b0cc421e8884e9ac8ad28e2c7a5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,49 +141,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4fd1df7c2d7df9c88fb11f41f41cda334f9df8b95af137b7a04abf8f6c51ee44",
+        "lastblockhash" : "0x95f97985e4df2b644020988a253915477a42f4ca45193cb26479ccdc040d4609",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -182,21 +192,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -206,27 +216,32 @@
         }
     },
     "callcodeOutput1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "c2b0eba5b8d6612f36afde0f43390b79b3b926a067807e99eb84e4c8cb9225a9",
-                    "mixHash" : "0a4be5c3d98ba77c415148d9abc5a505f922627f480b2d8eabec3cc037f0ad91",
-                    "nonce" : "08e78beca1e88df5",
+                    "hash" : "0x058386e2aba4c740d4cec2ebd98ecd409ffa16aca1b4f1efab1b2f54713dbab4",
+                    "mixHash" : "0x35bf7b85da0a93f1de3ecdc8a4d56b535a2c9c8844a2b905f6233c71e370f8b5",
+                    "nonce" : "0xdd1d9ab83fcf51d1",
                     "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00a4be5c3d98ba77c415148d9abc5a505f922627f480b2d8eabec3cc037f0ad918808e78beca1e88df5c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035bf7b85da0a93f1de3ecdc8a4d56b535a2c9c8844a2b905f6233c71e370f8b588dd1d9ab83fcf51d1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -234,49 +249,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c2b0eba5b8d6612f36afde0f43390b79b3b926a067807e99eb84e4c8cb9225a9",
+        "lastblockhash" : "0x058386e2aba4c740d4cec2ebd98ecd409ffa16aca1b4f1efab1b2f54713dbab4",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -285,21 +300,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -309,27 +324,32 @@
         }
     },
     "callcodeOutput1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "b4a293b7f7ca9200aca43e24c44c3e336189ae4b0454a2e20b27eef35ad66ea7",
-                    "mixHash" : "d2e8df1ff0955616285f8def3cf179b865b0b764c537d98b742dfc931b62b0f0",
-                    "nonce" : "49c17aa2d9598475",
+                    "hash" : "0x3002dceabb5d08b57a8d0ec1aa1ece3f4db7ab8768e9434315d2796a9d82acc8",
+                    "mixHash" : "0xa68e510771184b6589f0bf541767fc21c125f13a45225c0693289c8f3aa13651",
+                    "nonce" : "0x55861b47eb569c2e",
                     "number" : "0x01",
-                    "parentHash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d2e8df1ff0955616285f8def3cf179b865b0b764c537d98b742dfc931b62b0f08849c17aa2d9598475c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a68e510771184b6589f0bf541767fc21c125f13a45225c0693289c8f3aa136518855861b47eb569c2ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -337,49 +357,164 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b4a293b7f7ca9200aca43e24c44c3e336189ae4b0454a2e20b27eef35ad66ea7",
+        "lastblockhash" : "0x3002dceabb5d08b57a8d0ec1aa1ece3f4db7ab8768e9434315d2796a9d82acc8",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x090aac1553174d0cb5510ea064e880227711a2de5c919ff1490ebc1f4cd0d0cf",
+                    "mixHash" : "0xc2f4df5b3a258b86eec1ad9687bde138c4fefd77cf1022548d4a155c787457e9",
+                    "nonce" : "0x928d8279dfcd2bdd",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c2f4df5b3a258b86eec1ad9687bde138c4fefd77cf1022548d4a155c787457e988928d8279dfcd2bddc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x090aac1553174d0cb5510ea064e880227711a2de5c919ff1490ebc1f4cd0d0cf",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -388,21 +523,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
index e13b1bb5b..70e2b0b7f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "callcodeOutput2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "b7073c77f7a1e2154272b1862d84ab9726114bb59e4baf529cd36e56d622cea5",
-                    "mixHash" : "0cc48bd9b95aa80fdb76b0ba75f6acf444d3e3bec18f1814a14638e61e5f792e",
-                    "nonce" : "5b0fb910a8d2618f",
+                    "hash" : "0xe2f9211febea7793ae5f7f5c15835a3eac2917844bb83a0e89e1d64328dd31ee",
+                    "mixHash" : "0x32fd7e17ebfcd01e2dd236573252ba797b21a18c81329d3b0ca090f6e7e05519",
+                    "nonce" : "0x72472e9c7bc5c7ff",
                     "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00cc48bd9b95aa80fdb76b0ba75f6acf444d3e3bec18f1814a14638e61e5f792e885b0fb910a8d2618fc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a032fd7e17ebfcd01e2dd236573252ba797b21a18c81329d3b0ca090f6e7e055198872472e9c7bc5c7ffc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,49 +33,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b7073c77f7a1e2154272b1862d84ab9726114bb59e4baf529cd36e56d622cea5",
+        "lastblockhash" : "0xe2f9211febea7793ae5f7f5c15835a3eac2917844bb83a0e89e1d64328dd31ee",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -79,21 +84,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -103,27 +108,32 @@
         }
     },
     "callcodeOutput2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "224f33447948239db84c3d13ea5f8c2ce7a0bcc76d9cf96ef16d4bb1ebe5d0b3",
-                    "mixHash" : "d35bc9018fd0549164a945e8cb9d609fb814876a556c894971e4328915e66e32",
-                    "nonce" : "d5b9f2318cb2e17b",
+                    "hash" : "0x2c1fd023c06e8b03f204d7d4ae247dfc5e038df876c4b5409e8c40025e9ecf6c",
+                    "mixHash" : "0xc7b6c275b6b08b1e55e6b7d407282f277c112c0fac6810f1af215dd17edb0179",
+                    "nonce" : "0x9b75df1bbfdb938c",
                     "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d35bc9018fd0549164a945e8cb9d609fb814876a556c894971e4328915e66e3288d5b9f2318cb2e17bc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c7b6c275b6b08b1e55e6b7d407282f277c112c0fac6810f1af215dd17edb0179889b75df1bbfdb938cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,49 +141,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "224f33447948239db84c3d13ea5f8c2ce7a0bcc76d9cf96ef16d4bb1ebe5d0b3",
+        "lastblockhash" : "0x2c1fd023c06e8b03f204d7d4ae247dfc5e038df876c4b5409e8c40025e9ecf6c",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -182,21 +192,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -206,27 +216,32 @@
         }
     },
     "callcodeOutput2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "ec05eeb8eb27b68651547806a02692b4bf9299100e34ea085dce341600681db4",
-                    "mixHash" : "4cc694de548bfe06624bb21df43731be0667bb0a036acfefd1a739ef47daa0ff",
-                    "nonce" : "d494ec8d4287fc59",
+                    "hash" : "0xf8831914002e0c8cd0907b0f5053c68978ddf56329ba4b80fa67d17b98cf3fcf",
+                    "mixHash" : "0xb7ccb10fccef51856e89a6033846380ca4583c284a12d0ae18a767176249c15e",
+                    "nonce" : "0xd517041fdb7beac3",
                     "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04cc694de548bfe06624bb21df43731be0667bb0a036acfefd1a739ef47daa0ff88d494ec8d4287fc59c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b7ccb10fccef51856e89a6033846380ca4583c284a12d0ae18a767176249c15e88d517041fdb7beac3c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -234,49 +249,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ec05eeb8eb27b68651547806a02692b4bf9299100e34ea085dce341600681db4",
+        "lastblockhash" : "0xf8831914002e0c8cd0907b0f5053c68978ddf56329ba4b80fa67d17b98cf3fcf",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -285,21 +300,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -309,27 +324,32 @@
         }
     },
     "callcodeOutput2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "703903fdd02974394ad0ac86ab9a10583ddf65603a2ca02987d3afe2e90b61b5",
-                    "mixHash" : "f10d4658568d12b6374e69032bf947b046df094994e21fdbb8a4115f7d07ef1e",
-                    "nonce" : "58285ae13b23bdca",
+                    "hash" : "0x452a15e25bf1dff68002192944441b5debf0f32ba926786af67553eb6a46701a",
+                    "mixHash" : "0x94f9c64d2751a32b1a48cf5c158f3ff0e25cb990f1641bbf4c5183b4bb12aa19",
+                    "nonce" : "0xf77ecaaceb56d5b3",
                     "number" : "0x01",
-                    "parentHash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f10d4658568d12b6374e69032bf947b046df094994e21fdbb8a4115f7d07ef1e8858285ae13b23bdcac0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a094f9c64d2751a32b1a48cf5c158f3ff0e25cb990f1641bbf4c5183b4bb12aa1988f77ecaaceb56d5b3c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -337,49 +357,164 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "703903fdd02974394ad0ac86ab9a10583ddf65603a2ca02987d3afe2e90b61b5",
+        "lastblockhash" : "0x452a15e25bf1dff68002192944441b5debf0f32ba926786af67553eb6a46701a",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xc76102ac76f88541c8b51687703d3cca5565914c999ec084a8075d07f5133e12",
+                    "mixHash" : "0x5b62a69b6e02ed975a7dce40d1b830f9ef6751c151914d01a2babf6ca1249287",
+                    "nonce" : "0x1416e9b66bf9968e",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05b62a69b6e02ed975a7dce40d1b830f9ef6751c151914d01a2babf6ca1249287881416e9b66bf9968ec0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc76102ac76f88541c8b51687703d3cca5565914c999ec084a8075d07f5133e12",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -388,21 +523,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
index 55d3a27f2..302e39fdf 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "callcodeOutput3Fail_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "551268fd2a7d4dbba9b8c7172aa29303846c59f4e2ce2a92c9cbe3d2bdd21d10",
-                    "mixHash" : "26aa147c09c857baacd63e3c8c282c9a51a10cc1d5c0e37f7abefe4c59814b37",
-                    "nonce" : "940bb2c737e20f41",
+                    "hash" : "0xa3af699e2910ca251601e98b6767f0beabd6409315e64731bfcbb8722bc3a271",
+                    "mixHash" : "0xb095950e2b37888250ac6eff7dfb73adbbd50192a9100ebc34a3c4652097726e",
+                    "nonce" : "0x20f50d1e18334b27",
                     "number" : "0x01",
-                    "parentHash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a026aa147c09c857baacd63e3c8c282c9a51a10cc1d5c0e37f7abefe4c59814b3788940bb2c737e20f41c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b095950e2b37888250ac6eff7dfb73adbbd50192a9100ebc34a3c4652097726e8820f50d1e18334b27c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,49 +33,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "551268fd2a7d4dbba9b8c7172aa29303846c59f4e2ce2a92c9cbe3d2bdd21d10",
+        "lastblockhash" : "0xa3af699e2910ca251601e98b6767f0beabd6409315e64731bfcbb8722bc3a271",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -79,21 +84,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -103,27 +108,32 @@
         }
     },
     "callcodeOutput3Fail_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "edb1972ba09e5b94f4699fe7ba899bca5dcc215186d34bf18a1fc20a21d3405a",
-                    "mixHash" : "cc2ceff5d275f596da6de50fd6e0939da0a29dd006eb746f428103fc718d8c0a",
-                    "nonce" : "16489fb7e5e6510b",
+                    "hash" : "0x8d57883012b82f3fca5b2e50f9ceb418f69979872ce4bc16185879143c6ca8ce",
+                    "mixHash" : "0x9d33f7a4a3c604a2f151defd55d6d931bb19b30dbde0416781c92696a30b5b50",
+                    "nonce" : "0xb13a3c1bdab1a910",
                     "number" : "0x01",
-                    "parentHash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cc2ceff5d275f596da6de50fd6e0939da0a29dd006eb746f428103fc718d8c0a8816489fb7e5e6510bc0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09d33f7a4a3c604a2f151defd55d6d931bb19b30dbde0416781c92696a30b5b5088b13a3c1bdab1a910c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,49 +141,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "edb1972ba09e5b94f4699fe7ba899bca5dcc215186d34bf18a1fc20a21d3405a",
+        "lastblockhash" : "0x8d57883012b82f3fca5b2e50f9ceb418f69979872ce4bc16185879143c6ca8ce",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -182,21 +192,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -206,27 +216,32 @@
         }
     },
     "callcodeOutput3Fail_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "8e2d30beae10644a4865d7ef1251341de02a92848b5bd36866f47f094b438bb7",
-                    "mixHash" : "d163695fc788ab34fa88d299919d332937c10757ce016a79d7806993bc291f66",
-                    "nonce" : "96a4975e6ecf1fcc",
+                    "hash" : "0x5c98bb8caf86e2cf4f21249cda346325c55e19966e5c68147103138535ce0afa",
+                    "mixHash" : "0x22ae81c0a79798c894f879a08fd3a5ae587e1a8852215b675d86037518339af6",
+                    "nonce" : "0x3c1170c1e4622a44",
                     "number" : "0x01",
-                    "parentHash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d163695fc788ab34fa88d299919d332937c10757ce016a79d7806993bc291f668896a4975e6ecf1fccc0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a022ae81c0a79798c894f879a08fd3a5ae587e1a8852215b675d86037518339af6883c1170c1e4622a44c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -234,49 +249,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8e2d30beae10644a4865d7ef1251341de02a92848b5bd36866f47f094b438bb7",
+        "lastblockhash" : "0x5c98bb8caf86e2cf4f21249cda346325c55e19966e5c68147103138535ce0afa",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -285,21 +300,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -309,27 +324,32 @@
         }
     },
     "callcodeOutput3Fail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "7ffb9583e795dbf6d2af2cd8b0015cd30836da8aaf8fef8f15d9b2bc354e54b0",
-                    "mixHash" : "a3f7258b980c633bf5327eb9b9e43730207250dc67362c92f8b8ff433ca744e3",
-                    "nonce" : "47a7d7d1fb0220c3",
+                    "hash" : "0x34da1fc682ef63eac2ebf5e14153e1e33fe0ce72d801ed3551fda5bd6f0d5641",
+                    "mixHash" : "0xcb8d4401d71dc53f20948fb59b8baf5ae0d42231e9111169b3a5bec82aa4839f",
+                    "nonce" : "0x84b58f1940d39d8b",
                     "number" : "0x01",
-                    "parentHash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3f7258b980c633bf5327eb9b9e43730207250dc67362c92f8b8ff433ca744e38847a7d7d1fb0220c3c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cb8d4401d71dc53f20948fb59b8baf5ae0d42231e9111169b3a5bec82aa4839f8884b58f1940d39d8bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -337,49 +357,164 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7ffb9583e795dbf6d2af2cd8b0015cd30836da8aaf8fef8f15d9b2bc354e54b0",
+        "lastblockhash" : "0x34da1fc682ef63eac2ebf5e14153e1e33fe0ce72d801ed3551fda5bd6f0d5641",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3Fail_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x443f22217644cf8b854c712ab53c19913e7ecd0c32260a15397cfba5275ca2cb",
+                    "mixHash" : "0x2ce1fd6e9e3f0bb74314e8207a4a834822a35706ed08b3adc98f0c5f4f43393d",
+                    "nonce" : "0xb0394fcc8a8fd95a",
+                    "number" : "0x01",
+                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xe018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02ce1fd6e9e3f0bb74314e8207a4a834822a35706ed08b3adc98f0c5f4f43393d88b0394fcc8a8fd95ac0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x443f22217644cf8b854c712ab53c19913e7ecd0c32260a15397cfba5275ca2cb",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -388,21 +523,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
index 4fbed1dad..fed1edaf5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "callcodeOutput3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "8a56d5c127533a40005767bcab1d6209bb493a45569eec23e4bf11646306bebb",
-                    "mixHash" : "422fd479b4fc6b9fe38e4050b09e2fbe3cff852b2108e5b9b5b46f218d3e460f",
-                    "nonce" : "899a849e3ce5388a",
+                    "hash" : "0xb551991709a1192fef3cd2be3fea5439bfb450982a256024387c6da6320d446c",
+                    "mixHash" : "0x2142cc10075c750d31edd53a3f8975a81fc51a67f914799aae1bac3c4fe5133f",
+                    "nonce" : "0x515a06fc05775742",
                     "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0422fd479b4fc6b9fe38e4050b09e2fbe3cff852b2108e5b9b5b46f218d3e460f88899a849e3ce5388ac0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02142cc10075c750d31edd53a3f8975a81fc51a67f914799aae1bac3c4fe5133f88515a06fc05775742c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,49 +33,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8a56d5c127533a40005767bcab1d6209bb493a45569eec23e4bf11646306bebb",
+        "lastblockhash" : "0xb551991709a1192fef3cd2be3fea5439bfb450982a256024387c6da6320d446c",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -79,21 +84,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -103,27 +108,32 @@
         }
     },
     "callcodeOutput3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "fe3d62b7bb6eaa4576d318535b5b576a1dcef9dbba15f5490d8e52012460755c",
-                    "mixHash" : "e1d65aac8191b98f6a082c3e4a3bfc6e3d0b575a30a558e967cedbbdb71783dd",
-                    "nonce" : "e92a11aa77bda470",
+                    "hash" : "0x0cb333cdb233e6856864908e4c6e560c11cf9567a3c44ecb0fd3e9eb62a01311",
+                    "mixHash" : "0xf16d00d8163b37d57973f121703cd6b12e0bcca8a649ba2aeb813f239223ff4b",
+                    "nonce" : "0x1bbcc4c685e1833a",
                     "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e1d65aac8191b98f6a082c3e4a3bfc6e3d0b575a30a558e967cedbbdb71783dd88e92a11aa77bda470c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f16d00d8163b37d57973f121703cd6b12e0bcca8a649ba2aeb813f239223ff4b881bbcc4c685e1833ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,49 +141,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fe3d62b7bb6eaa4576d318535b5b576a1dcef9dbba15f5490d8e52012460755c",
+        "lastblockhash" : "0x0cb333cdb233e6856864908e4c6e560c11cf9567a3c44ecb0fd3e9eb62a01311",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -182,21 +192,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -206,27 +216,32 @@
         }
     },
     "callcodeOutput3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "b39896d396fb92b468fbe44808acafce2cfe1e30d263781befc6252c51b48d3a",
-                    "mixHash" : "c66da0c432ad598e08440af62b18b4805b19c12f05b7cccac2f01e6aa9701f3d",
-                    "nonce" : "b9fe1a11239297ba",
+                    "hash" : "0xaf92fee11239d61de56cc1811778e8831821853c21fd4784409c546b0e2cb44c",
+                    "mixHash" : "0x864556ad64bbcf2f51c41b59733ff31912460e2c10f2131b024d421c63475ef7",
+                    "nonce" : "0x0be3e6f9462dbd46",
                     "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c66da0c432ad598e08440af62b18b4805b19c12f05b7cccac2f01e6aa9701f3d88b9fe1a11239297bac0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0864556ad64bbcf2f51c41b59733ff31912460e2c10f2131b024d421c63475ef7880be3e6f9462dbd46c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -234,49 +249,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b39896d396fb92b468fbe44808acafce2cfe1e30d263781befc6252c51b48d3a",
+        "lastblockhash" : "0xaf92fee11239d61de56cc1811778e8831821853c21fd4784409c546b0e2cb44c",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -285,21 +300,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -309,27 +324,32 @@
         }
     },
     "callcodeOutput3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "194bcca358697a6d9ca1a4fa557784bc93c6d47e7356ea3b5cf36b64886791e6",
-                    "mixHash" : "e61e63d5aa0e6ceeee3d5ade7a303dcad5d89a3077b2ffe4a3dae0174664be05",
-                    "nonce" : "81322b1b3139e3ab",
+                    "hash" : "0xb85f6e96479446677a09143e8ce1aee39c88ece0535f21c2c28698f74495bf4d",
+                    "mixHash" : "0x65593bb6567561ca72c6770a4876594bd24c16afffd40676c909d2ac2e5aa15a",
+                    "nonce" : "0x1f6884e0cb87558a",
                     "number" : "0x01",
-                    "parentHash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e61e63d5aa0e6ceeee3d5ade7a303dcad5d89a3077b2ffe4a3dae0174664be058881322b1b3139e3abc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a065593bb6567561ca72c6770a4876594bd24c16afffd40676c909d2ac2e5aa15a881f6884e0cb87558ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -337,49 +357,164 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "194bcca358697a6d9ca1a4fa557784bc93c6d47e7356ea3b5cf36b64886791e6",
+        "lastblockhash" : "0xb85f6e96479446677a09143e8ce1aee39c88ece0535f21c2c28698f74495bf4d",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x26e714c30e728e4535481174cb556d980142b2d77ad25bb20ad0cdf5118870dc",
+                    "mixHash" : "0x6d5ccc314a5dfda6d44081ef1aa45f452a15c69284053ab32ea458c3f0d00a77",
+                    "nonce" : "0x89a48d9a26f98912",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06d5ccc314a5dfda6d44081ef1aa45f452a15c69284053ab32ea458c3f0d00a778889a48d9a26f98912c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x26e714c30e728e4535481174cb556d980142b2d77ad25bb20ad0cdf5118870dc",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -388,21 +523,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
index f5e4fa5fd..5e9459e29 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "callcodeOutput3partialFail_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "54e860944cf9b55f04501949ca35af0ce07c820074779cd21bddba4880a89be4",
-                    "mixHash" : "a941c12742450abcbcf10b2c68ad071104f6897f2e5030158550e59d4b9d0744",
-                    "nonce" : "a027d58e8699d747",
+                    "hash" : "0x72c6b2b99aea62b0e5d8702421f7850457996afe1dac63b2562003e784482ed3",
+                    "mixHash" : "0x9a3cb8f94f5fabc153a908ab244cf17561716dff8df147238b64995272229ff7",
+                    "nonce" : "0xaa0213cc8a3fbafd",
                     "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a941c12742450abcbcf10b2c68ad071104f6897f2e5030158550e59d4b9d074488a027d58e8699d747c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09a3cb8f94f5fabc153a908ab244cf17561716dff8df147238b64995272229ff788aa0213cc8a3fbafdc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,49 +33,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "54e860944cf9b55f04501949ca35af0ce07c820074779cd21bddba4880a89be4",
+        "lastblockhash" : "0x72c6b2b99aea62b0e5d8702421f7850457996afe1dac63b2562003e784482ed3",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -79,21 +84,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -103,27 +108,32 @@
         }
     },
     "callcodeOutput3partialFail_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "9f0282a84b9ddc11900417eab0e1287373cede22266bf651f4e3826f4387bae1",
-                    "mixHash" : "6b13a6774c28f709ccfcae1de4006e7aa2577085d52366908f14e7031239ab29",
-                    "nonce" : "0cd0f30e67e28892",
+                    "hash" : "0x45ce3b0dbd2c3c7e3dcb54483393c2208fd4e4626f3e0fd198f356ae034f0923",
+                    "mixHash" : "0x69be892a042241bd07ea7dda31e35cb30bf3fca8eb10d34a92a6528651716f08",
+                    "nonce" : "0xe7b5b377ddd28ed2",
                     "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06b13a6774c28f709ccfcae1de4006e7aa2577085d52366908f14e7031239ab29880cd0f30e67e28892c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a069be892a042241bd07ea7dda31e35cb30bf3fca8eb10d34a92a6528651716f0888e7b5b377ddd28ed2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,49 +141,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9f0282a84b9ddc11900417eab0e1287373cede22266bf651f4e3826f4387bae1",
+        "lastblockhash" : "0x45ce3b0dbd2c3c7e3dcb54483393c2208fd4e4626f3e0fd198f356ae034f0923",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -182,21 +192,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -206,27 +216,32 @@
         }
     },
     "callcodeOutput3partialFail_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "948587691b9693b9bbc421022c4ffe30b37e4db2e1d641effb9701ebd2578d46",
-                    "mixHash" : "85ea29c7a609178a928820fe342d73c44273473d407d4795b7943ac72c9ae823",
-                    "nonce" : "cd107633ec4493c5",
+                    "hash" : "0x0272a81f5884a4b957729f79ba8bf9f481e68c2d0b24c2a0017cd89989c4556c",
+                    "mixHash" : "0xfabd94dfccb589241e184690ecb78a1c79727eb84a25fdd79cf7004e10033d23",
+                    "nonce" : "0xe419377082012efb",
                     "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a085ea29c7a609178a928820fe342d73c44273473d407d4795b7943ac72c9ae82388cd107633ec4493c5c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fabd94dfccb589241e184690ecb78a1c79727eb84a25fdd79cf7004e10033d2388e419377082012efbc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -234,49 +249,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "948587691b9693b9bbc421022c4ffe30b37e4db2e1d641effb9701ebd2578d46",
+        "lastblockhash" : "0x0272a81f5884a4b957729f79ba8bf9f481e68c2d0b24c2a0017cd89989c4556c",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -285,21 +300,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -309,27 +324,32 @@
         }
     },
     "callcodeOutput3partialFail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "5a7f881781c32cfd5226066b64deafad8632a0ce2d74bfb4c04bc6bba100a9ba",
-                    "mixHash" : "235040f100220fde859d89c5c404eb41a7e77f1afdca9ed98d9bb6a1aafc58bd",
-                    "nonce" : "309158a4ef633dc6",
+                    "hash" : "0xf3dad3d6977b76563fa1d5ab974576230f32e7cd2d10f5974ac9d510e715cb25",
+                    "mixHash" : "0x312262b3ec0c33790e3cb6bd35bf6fcba66a9a8250768a2b30a6dbe49eac0fce",
+                    "nonce" : "0x5590ce7e1948ad07",
                     "number" : "0x01",
-                    "parentHash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0235040f100220fde859d89c5c404eb41a7e77f1afdca9ed98d9bb6a1aafc58bd88309158a4ef633dc6c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0312262b3ec0c33790e3cb6bd35bf6fcba66a9a8250768a2b30a6dbe49eac0fce885590ce7e1948ad07c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -337,49 +357,164 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5a7f881781c32cfd5226066b64deafad8632a0ce2d74bfb4c04bc6bba100a9ba",
+        "lastblockhash" : "0xf3dad3d6977b76563fa1d5ab974576230f32e7cd2d10f5974ac9d510e715cb25",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3partialFail_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x7c408188bfcdc574d81d40c781ba07f61855f6fcc14cee4a1d1302b7ee3fc79e",
+                    "mixHash" : "0x77613a04a4f136839b93feb7bd7ea8c7993c10ae0dd90b14a317dbef3cf86fa2",
+                    "nonce" : "0x145c566428af92cc",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a077613a04a4f136839b93feb7bd7ea8c7993c10ae0dd90b14a317dbef3cf86fa288145c566428af92ccc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7c408188bfcdc574d81d40c781ba07f61855f6fcc14cee4a1d1302b7ee3fc79e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
@@ -388,21 +523,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x016001600101600055",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
index 17be436d7..aee594274 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "callcodeOutput3partial_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "2996fad036628ab3a8d0b591513917963734008bb14cb852db08a68e869e8f72",
-                    "mixHash" : "d7005328e5ab1b179016aafb59bd0e6c9806a2db1c3056fc8f78794a7512bdd8",
-                    "nonce" : "d513301c1dfb73a0",
+                    "hash" : "0x5397f0995a71c9383a2b17d48718ec7b5bb8ceecb990f0b05ae6eec73fc615fa",
+                    "mixHash" : "0x1ac2a75f9adca2ef826741c2763626500ac42e3ce0fb9b01bbc53f8a53c3d34d",
+                    "nonce" : "0x296ace3b00cc5c6a",
                     "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d7005328e5ab1b179016aafb59bd0e6c9806a2db1c3056fc8f78794a7512bdd888d513301c1dfb73a0c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01ac2a75f9adca2ef826741c2763626500ac42e3ce0fb9b01bbc53f8a53c3d34d88296ace3b00cc5c6ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -28,49 +33,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2996fad036628ab3a8d0b591513917963734008bb14cb852db08a68e869e8f72",
+        "lastblockhash" : "0x5397f0995a71c9383a2b17d48718ec7b5bb8ceecb990f0b05ae6eec73fc615fa",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -79,21 +84,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -103,27 +108,32 @@
         }
     },
     "callcodeOutput3partial_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "4716f9eccfe0424a028a8f21e4bace269b3ddf42a57fc5502217b62d06b140f8",
-                    "mixHash" : "0818c46e6f64e5bfa6171fff4d1f4ebd83a1f9078f5c354526ea537de3cd00bf",
-                    "nonce" : "072b807070dc859f",
+                    "hash" : "0x9e85976b2ca7d4c7f3f644bb891b7ec9f7ee85394ba56fe52efdcee6cc16a7d7",
+                    "mixHash" : "0x819e822adff9d71d965fdac3d5293c8203c9b375c1dba4e2ef76d72e3eb81525",
+                    "nonce" : "0x0d392ec51393750c",
                     "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00818c46e6f64e5bfa6171fff4d1f4ebd83a1f9078f5c354526ea537de3cd00bf88072b807070dc859fc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0819e822adff9d71d965fdac3d5293c8203c9b375c1dba4e2ef76d72e3eb81525880d392ec51393750cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,49 +141,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4716f9eccfe0424a028a8f21e4bace269b3ddf42a57fc5502217b62d06b140f8",
+        "lastblockhash" : "0x9e85976b2ca7d4c7f3f644bb891b7ec9f7ee85394ba56fe52efdcee6cc16a7d7",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -182,21 +192,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -206,27 +216,32 @@
         }
     },
     "callcodeOutput3partial_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "11c774f37b8c24f4bea6ddb8c18b629425e25379545192d4d4afd7c5b84e3513",
-                    "mixHash" : "669cbec02f1a29f941a63dae14abd203fdc99441acd78c7444ae19b2fe3e4652",
-                    "nonce" : "ca0625d1b8e3618d",
+                    "hash" : "0xfd36f0d9433016ac60ef6d3fa4806d962232111580642e177780044507e0330d",
+                    "mixHash" : "0xe1bde2bc7ebfda2fcfbf0dfe3f66bc4635cd569f7192ff716a3c51a6e3c49d1a",
+                    "nonce" : "0x4dc69a878a124b55",
                     "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0669cbec02f1a29f941a63dae14abd203fdc99441acd78c7444ae19b2fe3e465288ca0625d1b8e3618dc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e1bde2bc7ebfda2fcfbf0dfe3f66bc4635cd569f7192ff716a3c51a6e3c49d1a884dc69a878a124b55c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -234,49 +249,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "11c774f37b8c24f4bea6ddb8c18b629425e25379545192d4d4afd7c5b84e3513",
+        "lastblockhash" : "0xfd36f0d9433016ac60ef6d3fa4806d962232111580642e177780044507e0330d",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -285,21 +300,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -309,27 +324,32 @@
         }
     },
     "callcodeOutput3partial_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "89c5f95fe162187510016ef47ff23667d644476306cd087c76cb072e8b0235a8",
-                    "mixHash" : "1ddd79d42f22a73760487f269bfe5d4f3318b386c132ab92a8077ab11d53d615",
-                    "nonce" : "f118b39efb78091e",
+                    "hash" : "0x3a1769adc1bdc026f592807602c83b34fec010629af1abd074170df19fbcbfc4",
+                    "mixHash" : "0x6609220a63658e09874b0ad6e4410b673d744babac01b7fd27f8f5a86db6f74e",
+                    "nonce" : "0x39e62a02a7b607ac",
                     "number" : "0x01",
-                    "parentHash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01ddd79d42f22a73760487f269bfe5d4f3318b386c132ab92a8077ab11d53d61588f118b39efb78091ec0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06609220a63658e09874b0ad6e4410b673d744babac01b7fd27f8f5a86db6f74e8839e62a02a7b607acc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -337,49 +357,164 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "89c5f95fe162187510016ef47ff23667d644476306cd087c76cb072e8b0235a8",
+        "lastblockhash" : "0x3a1769adc1bdc026f592807602c83b34fec010629af1abd074170df19fbcbfc4",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3partial_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xa08897de8ede14d221a506b4812ccd28a2a6dd94ebad1f5ecedb7eea009d0155",
+                    "mixHash" : "0xbf3a9c02f8c511402f2817eea7d0c7a9a65d42e01d53e138018f5b797a54ac34",
+                    "nonce" : "0x48c8fc50213132e4",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bf3a9c02f8c511402f2817eea7d0c7a9a65d42e01d53e138018f5b797a54ac348848c8fc50213132e4c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa08897de8ede14d221a506b4812ccd28a2a6dd94ebad1f5ecedb7eea009d0155",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
@@ -388,21 +523,21 @@
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600101600055",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
index 5f601f8e6..b957664c0 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodeWithHighValueAndGasOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "e56c9af8f3c40371630f6d6c2b448790ef77b4badd3473ba17a0a4258c45ea88",
-                    "mixHash" : "a62b098b33b59aaec09791bc03de2088d423e7473878f88d5f40b0014dd2598e",
-                    "nonce" : "ec0a0a0e89082a14",
+                    "hash" : "0xdcfc3c630613ffe919bd05b7e1cc03971c19681c94bb4439bd33e6c6f232e765",
+                    "mixHash" : "0x54e86c274a44bdcf909de4291dedc2af861c4c704ce86fb92152387201bc804e",
+                    "nonce" : "0x0bdab3134fe732f6",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
+                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0a62b098b33b59aaec09791bc03de2088d423e7473878f88d5f40b0014dd2598e88ec0a0a0e89082a14f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a054e86c274a44bdcf909de4291dedc2af861c4c704ce86fb92152387201bc804e880bdab3134fe732f6f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e56c9af8f3c40371630f6d6c2b448790ef77b4badd3473ba17a0a4258c45ea88",
+        "lastblockhash" : "0xdcfc3c630613ffe919bd05b7e1cc03971c19681c94bb4439bd33e6c6f232e765",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f149",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7618817",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "callcodeWithHighValueAndGasOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "199b4c2958008f412604020f51261c6eaaebae9f363556f2ece4cc9e271422fb",
-                    "mixHash" : "5e112d5deeca49cc71377421eb0afcc2a2e1364f70983c973fed88ac6a34774f",
-                    "nonce" : "d4ba5bcf4d961b9f",
+                    "hash" : "0x934d27b53481612c663af327cc8b559c925baa60be3ee0d3a5ac3017a8bfe0b6",
+                    "mixHash" : "0x307e8659d90f737aa8c48320da0d295788fee6f5095f6052d2bdf17c4fc94576",
+                    "nonce" : "0xfd2418f43bb10ddd",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
+                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a05e112d5deeca49cc71377421eb0afcc2a2e1364f70983c973fed88ac6a34774f88d4ba5bcf4d961b9ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0307e8659d90f737aa8c48320da0d295788fee6f5095f6052d2bdf17c4fc9457688fd2418f43bb10dddf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "199b4c2958008f412604020f51261c6eaaebae9f363556f2ece4cc9e271422fb",
+        "lastblockhash" : "0x934d27b53481612c663af327cc8b559c925baa60be3ee0d3a5ac3017a8bfe0b6",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f149",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7618817",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "7dba72cc5b77a7734ca7aced5e340a6abba4218137df205ae7f5af9da5032b9e",
-                    "mixHash" : "25ebeeeb4cde4b0ef9ab4972eaa91165c6e2a846977f5e3487a6518f17b19c39",
-                    "nonce" : "e360e01397191755",
+                    "hash" : "0xfa8269d141506e043f3bb95fc0a089939d5862f1e980336b3205e3aec8eeb6ab",
+                    "mixHash" : "0xa295711dcd48da74f13849de9807c37e637402b1e3c01eac46134e52996e87e6",
+                    "nonce" : "0x284ea218e2f982f9",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
+                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a025ebeeeb4cde4b0ef9ab4972eaa91165c6e2a846977f5e3487a6518f17b19c3988e360e01397191755f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0a295711dcd48da74f13849de9807c37e637402b1e3c01eac46134e52996e87e688284ea218e2f982f9f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7dba72cc5b77a7734ca7aced5e340a6abba4218137df205ae7f5af9da5032b9e",
+        "lastblockhash" : "0xfa8269d141506e043f3bb95fc0a089939d5862f1e980336b3205e3aec8eeb6ab",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "8ba5e3fd30a43c2c563efabb8cfaba7225f87cefd54a7f4988d83e1d9bca51c8",
-                    "mixHash" : "278666419dd46937881b31cdb9cd5560013f172b73a55109482cb778e7601a18",
-                    "nonce" : "9c63e822dc9a2815",
+                    "hash" : "0x6a56bdcfb4ee581000c23d085b55470f3f918c061f9f7b8afc9a8e35310db417",
+                    "mixHash" : "0x2b803eff91fbb85ccbca248ab69cdcd10f9e275d9ba1e307bc57d1150970cf95",
+                    "nonce" : "0x9a4c3a97c96cf0bc",
                     "number" : "0x01",
-                    "parentHash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
+                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0278666419dd46937881b31cdb9cd5560013f172b73a55109482cb778e7601a18889c63e822dc9a2815f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a02b803eff91fbb85ccbca248ab69cdcd10f9e275d9ba1e307bc57d1150970cf95889a4c3a97c96cf0bcf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
                         "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
@@ -385,74 +405,202 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8ba5e3fd30a43c2c563efabb8cfaba7225f87cefd54a7f4988d83e1d9bca51c8",
+        "lastblockhash" : "0x6a56bdcfb4ee581000c23d085b55470f3f918c061f9f7b8afc9a8e35310db417",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeWithHighValueAndGasOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x7059042dd26daeaba4dcfeb325a46f473d118e2d6af379dce8a5d9ec433232b3",
+                    "mixHash" : "0xf74c80955950cf14e967b1227d25cd8957c0f5abdef4c7ca9b5352ccdba3b843",
+                    "nonce" : "0xcf3f068d1eb3b191",
+                    "number" : "0x01",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0f74c80955950cf14e967b1227d25cd8957c0f5abdef4c7ca9b5352ccdba3b84388cf3f068d1eb3b191f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
+                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7059042dd26daeaba4dcfeb325a46f473d118e2d6af379dce8a5d9ec433232b3",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
index f6dd13b1d..ce1803915 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "deleagateCallAfterValueTransfer_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "492ba1b1916170492b915a221501088a98741b7cb8564188b0ac63e516db1880",
-                    "mixHash" : "b12e715cf01e5eb6e0857933c11ac72920984abc26539adbd4c26f0b8702f6c2",
-                    "nonce" : "f3420eb3ad9320b3",
+                    "hash" : "0x80c3fe6989bc8f4e151eda306bbd5f87edf30430911ffd0044a84e6588e29b25",
+                    "mixHash" : "0x5e01a6efce8c4197bb6b6ddded9c4da5710af0a1d421323cd48c7947021e4e67",
+                    "nonce" : "0x5a5a8aa1dc5bd5cf",
                     "number" : "0x01",
-                    "parentHash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
-                    "stateRoot" : "e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
+                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
+                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0b12e715cf01e5eb6e0857933c11ac72920984abc26539adbd4c26f0b8702f6c288f3420eb3ad9320b3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a05e01a6efce8c4197bb6b6ddded9c4da5710af0a1d421323cd48c7947021e4e67885a5a8aa1dc5bd5cff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "492ba1b1916170492b915a221501088a98741b7cb8564188b0ac63e516db1880",
+        "lastblockhash" : "0x80c3fe6989bc8f4e151eda306bbd5f87edf30430911ffd0044a84e6588e29b25",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f504c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbffb40",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "deleagateCallAfterValueTransfer_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "3bb29fb1c64e82a518d72dc219931903f51a15f170f428db00dc368d9d68a41f",
-                    "mixHash" : "4762b2573dfe71e7b5cae61c54f4622941a14fc513463116562c4d0a71cea44c",
-                    "nonce" : "344cc66c59b52bb1",
+                    "hash" : "0x7d5eac4c1c8fb18adec4840cd93101749a6798f185a97c94a7dbb03a38db0a77",
+                    "mixHash" : "0x106e19412964af63da707a83d434ce6a0b333c1adf00949a93221e622cdb8780",
+                    "nonce" : "0xdbf23b38211436fb",
                     "number" : "0x01",
-                    "parentHash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
-                    "stateRoot" : "e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
+                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
+                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a04762b2573dfe71e7b5cae61c54f4622941a14fc513463116562c4d0a71cea44c88344cc66c59b52bb1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0106e19412964af63da707a83d434ce6a0b333c1adf00949a93221e622cdb878088dbf23b38211436fbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3bb29fb1c64e82a518d72dc219931903f51a15f170f428db00dc368d9d68a41f",
+        "lastblockhash" : "0x7d5eac4c1c8fb18adec4840cd93101749a6798f185a97c94a7dbb03a38db0a77",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f504c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbffb40",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "deleagateCallAfterValueTransfer_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "5e1d96414ba0c0408311f6d0d78040b4bb5afc3b7510e67248eb3c23db89231e",
-                    "mixHash" : "81d8cfedff5a99495d7d4a8a8995d44d6b3c6f8f1a7dd2eb5a45c11f5d9cd876",
-                    "nonce" : "e71a4f8fe9434927",
+                    "hash" : "0x8f43800b7c8bc7f27fee92084b38d4ea18606de8751b74e69233fb9e4bb70ffb",
+                    "mixHash" : "0x6518c6f0ed87600228a509551e1230a218140433e3d9b361628ba5d89513e941",
+                    "nonce" : "0x35662562646c149a",
                     "number" : "0x01",
-                    "parentHash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
-                    "stateRoot" : "9dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1",
+                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+                    "receiptTrie" : "0xf9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
+                    "stateRoot" : "0x9dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a081d8cfedff5a99495d7d4a8a8995d44d6b3c6f8f1a7dd2eb5a45c11f5d9cd87688e71a4f8fe9434927f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a06518c6f0ed87600228a509551e1230a218140433e3d9b361628ba5d89513e9418835662562646c149af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5e1d96414ba0c0408311f6d0d78040b4bb5afc3b7510e67248eb3c23db89231e",
+        "lastblockhash" : "0x8f43800b7c8bc7f27fee92084b38d4ea18606de8751b74e69233fb9e4bb70ffb",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fae9d9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fba1627",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "deleagateCallAfterValueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01022c",
-                    "hash" : "f30da0292970116f037b354ce46457e823c4e00edfa373e31086fbe5258952b6",
-                    "mixHash" : "cbc3d93ead516d491c5773b5a6e9aef4d2e008df4981e6bf321cd0514fd96561",
-                    "nonce" : "08ddf98dd8b34688",
+                    "hash" : "0x53ab7311dda3e679cf8d48fb405b72d274760a89f03e44463dee32d36b18017b",
+                    "mixHash" : "0x3fb1dc799be64a73dca5ff26d1ae52405bdcc87a4c592eae18ee289d95a4dda7",
+                    "nonce" : "0xa9316a324e7419b3",
                     "number" : "0x01",
-                    "parentHash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
-                    "stateRoot" : "5d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1",
+                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+                    "receiptTrie" : "0xb39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
+                    "stateRoot" : "0x5d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a0cbc3d93ead516d491c5773b5a6e9aef4d2e008df4981e6bf321cd0514fd965618808ddf98dd8b34688f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a03fb1dc799be64a73dca5ff26d1ae52405bdcc87a4c592eae18ee289d95a4dda788a9316a324e7419b3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -385,28 +405,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f30da0292970116f037b354ce46457e823c4e00edfa373e31086fbe5258952b6",
+        "lastblockhash" : "0x53ab7311dda3e679cf8d48fb405b72d274760a89f03e44463dee32d36b18017b",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
@@ -415,46 +435,174 @@
                     "0x02" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5022c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbffdd4",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x3460005533600155600035600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "deleagateCallAfterValueTransfer_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0104c0",
+                    "hash" : "0xb0189e896c9e258a66eb89737dc352df788f750eeaa1f514e73366c4cfc7b140",
+                    "mixHash" : "0x7076aca2fd5cf7ef125ba3c2f2c194e467b293cdd8b40b3b293c9da4083f7cb3",
+                    "nonce" : "0xa5bcdf56c7b83439",
+                    "number" : "0x01",
+                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+                    "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
+                    "stateRoot" : "0x6fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a07076aca2fd5cf7ef125ba3c2f2c194e467b293cdd8b40b3b293c9da4083f7cb388a5bcdf56c7b83439f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb0189e896c9e258a66eb89737dc352df788f750eeaa1f514e73366c4cfc7b140",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x3460005533600155600035600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f504c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbffb40",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x3460005533600155600035600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
index cd2586a8b..ab0be6fc1 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallAndOOGatTxLevel_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "57b220aea0e75523ee577654534fff45ca4e715e587459b7ad765de3f3942ef6",
-                    "mixHash" : "c84c581583242b39ca03d9f2ac16418e3cb9664c15d8d6f7665f19d33357ad16",
-                    "nonce" : "ba340b1eef37bb88",
+                    "hash" : "0x17b171c1f34385fccf821cd375641ddf3826ffa412abac69ad8deaf9c81d485b",
+                    "mixHash" : "0x11b7c85f1099a5f4efb0b4447bffafe721a84a81f1a8f2201f5157d6981dbe71",
+                    "nonce" : "0xddbae83354e139c9",
                     "number" : "0x01",
-                    "parentHash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
-                    "stateRoot" : "ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
+                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+                    "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
+                    "stateRoot" : "0xef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0c84c581583242b39ca03d9f2ac16418e3cb9664c15d8d6f7665f19d33357ad1688ba340b1eef37bb88f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a011b7c85f1099a5f4efb0b4447bffafe721a84a81f1a8f2201f5157d6981dbe7188ddbae83354e139c9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "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" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "57b220aea0e75523ee577654534fff45ca4e715e587459b7ad765de3f3942ef6",
+        "lastblockhash" : "0x17b171c1f34385fccf821cd375641ddf3826ffa412abac69ad8deaf9c81d485b",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f131",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630ecf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "delegatecallAndOOGatTxLevel_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "24fe1f2896b5cb747cc005d48be3aaef021e16466f42c085365992bb6a07a28f",
-                    "mixHash" : "53bb1e4f867ebbffe76af055e08e1725854013a81eb013413069fbd808ab2d51",
-                    "nonce" : "4fd98f4a578afd97",
+                    "hash" : "0x76fe89aa11b2b2edc3aaa4c2ab44c25dcf6137c1be998d8007f9399998a70e87",
+                    "mixHash" : "0xb4d489fa2cc640a40d7782f061e3f7d2b872c408396d779d2f3b5fa85fca4e21",
+                    "nonce" : "0xcdac32f08e9043b5",
                     "number" : "0x01",
-                    "parentHash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
-                    "stateRoot" : "ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
+                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+                    "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
+                    "stateRoot" : "0xef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a053bb1e4f867ebbffe76af055e08e1725854013a81eb013413069fbd808ab2d51884fd98f4a578afd97f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0b4d489fa2cc640a40d7782f061e3f7d2b872c408396d779d2f3b5fa85fca4e2188cdac32f08e9043b5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "24fe1f2896b5cb747cc005d48be3aaef021e16466f42c085365992bb6a07a28f",
+        "lastblockhash" : "0x76fe89aa11b2b2edc3aaa4c2ab44c25dcf6137c1be998d8007f9399998a70e87",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f131",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630ecf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "delegatecallAndOOGatTxLevel_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "7b58d575e389dbd6e994aeb577b6dcd91c8bc637a4b0d8a4991f639e8fda2686",
-                    "mixHash" : "9fc269ccfdcc337c5d7cf73335aae718761af2aa307d9fddb7ad91291448d7ce",
-                    "nonce" : "cdb608c1098223e5",
+                    "hash" : "0xdcb25840070bc3212a02811bda41c43688894f2409e7f85acda290660f0d8e84",
+                    "mixHash" : "0x8973281be0e38f04b3605b6a15af19d3b53940fafc0406aa6a635177779da436",
+                    "nonce" : "0x3c878ee23444dd27",
                     "number" : "0x01",
-                    "parentHash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
-                    "stateRoot" : "83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
+                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+                    "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
+                    "stateRoot" : "0x83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a09fc269ccfdcc337c5d7cf73335aae718761af2aa307d9fddb7ad91291448d7ce88cdb608c1098223e5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08973281be0e38f04b3605b6a15af19d3b53940fafc0406aa6a635177779da436883c878ee23444dd27f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7b58d575e389dbd6e994aeb577b6dcd91c8bc637a4b0d8a4991f639e8fda2686",
+        "lastblockhash" : "0xdcb25840070bc3212a02811bda41c43688894f2409e7f85acda290660f0d8e84",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "delegatecallAndOOGatTxLevel_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "606d6193a841d01a263d9aefeda557c27e1561c2e156fbad9633ff801ab42bff",
-                    "mixHash" : "d9301fe2f7b76f6f8237faec20cb3a62869e511ff3dca7a96fc94c8ed37d33e8",
-                    "nonce" : "0eb07500661acf47",
+                    "hash" : "0x0d7aad5396da262b5d2b1f121582e7237bcfbd7f52032190196fa89aadb5bb6b",
+                    "mixHash" : "0x1f9f561068a3829fdff3734122c96b5a7a1d15b11bf4c459c93a77e9578fb3ec",
+                    "nonce" : "0xe9fa35dd97167780",
                     "number" : "0x01",
-                    "parentHash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
-                    "stateRoot" : "83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
+                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+                    "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
+                    "stateRoot" : "0x83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0d9301fe2f7b76f6f8237faec20cb3a62869e511ff3dca7a96fc94c8ed37d33e8880eb07500661acf47f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a01f9f561068a3829fdff3734122c96b5a7a1d15b11bf4c459c93a77e9578fb3ec88e9fa35dd97167780f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -385,74 +405,202 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "606d6193a841d01a263d9aefeda557c27e1561c2e156fbad9633ff801ab42bff",
+        "lastblockhash" : "0x0d7aad5396da262b5d2b1f121582e7237bcfbd7f52032190196fa89aadb5bb6b",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallAndOOGatTxLevel_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf131",
+                    "hash" : "0x8ee300cc3119ae9a0e8b22fff5c984a29f60fa67a2655461094d1593c83fee06",
+                    "mixHash" : "0xc0e8148bfacab819380508d868a93c617f2391d9b859f23eeba4e4d3a5ff6bc8",
+                    "nonce" : "0xb7f5ce39932a0c90",
+                    "number" : "0x01",
+                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+                    "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
+                    "stateRoot" : "0x5918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0c0e8148bfacab819380508d868a93c617f2391d9b859f23eeba4e4d3a5ff6bc888b7f5ce39932a0c90f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8ee300cc3119ae9a0e8b22fff5c984a29f60fa67a2655461094d1593c83fee06",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f131",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630ecf",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
index 5cb052eab..1794793e4 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallBasic_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "21f9080aeb72015b348d815f0f1a547ace252bf4993a579b738ab171bf1b59a3",
-                    "mixHash" : "fcbac6ccc38d665e7e9913e74b31b5a55f37fd2f0ce9e9d6be6cccd9db0c7158",
-                    "nonce" : "990e4a007e6c8453",
+                    "hash" : "0xad75f9ffa50fd35feca5eecbfe6b43a4347ee4323b2ffbddee37a093087e8132",
+                    "mixHash" : "0x99c6c83f228ee548bda762fd40fa4fe1ac9282d0b421add241e3e74ebec762af",
+                    "nonce" : "0xcc6a6ae487a6789a",
                     "number" : "0x01",
-                    "parentHash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
-                    "stateRoot" : "3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
+                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
+                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0fcbac6ccc38d665e7e9913e74b31b5a55f37fd2f0ce9e9d6be6cccd9db0c715888990e4a007e6c8453f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a099c6c83f228ee548bda762fd40fa4fe1ac9282d0b421add241e3e74ebec762af88cc6a6ae487a6789af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "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" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "21f9080aeb72015b348d815f0f1a547ace252bf4993a579b738ab171bf1b59a3",
+        "lastblockhash" : "0xad75f9ffa50fd35feca5eecbfe6b43a4347ee4323b2ffbddee37a093087e8132",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f137",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630ec9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "delegatecallBasic_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "f286c17bf3d5b604ce55f04c6e83078818b1c59605d182e55fae168adb688738",
-                    "mixHash" : "474ff39996ae019a41b14ff41356faf87de6de36ecb141f0ad62b042420c07e6",
-                    "nonce" : "83368da0dec8bdcc",
+                    "hash" : "0x4ca3cf6ef53b8358baecbd1141b8fb6db6cb12e95805984edaba80cc4f115ce6",
+                    "mixHash" : "0x99540aab8fb06436e8ef443998495a0f718fac379aff45dd4924feacf777b313",
+                    "nonce" : "0x2f725b40c53f0e7b",
                     "number" : "0x01",
-                    "parentHash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
-                    "stateRoot" : "3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
+                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
+                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0474ff39996ae019a41b14ff41356faf87de6de36ecb141f0ad62b042420c07e68883368da0dec8bdccf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a099540aab8fb06436e8ef443998495a0f718fac379aff45dd4924feacf777b313882f725b40c53f0e7bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f286c17bf3d5b604ce55f04c6e83078818b1c59605d182e55fae168adb688738",
+        "lastblockhash" : "0x4ca3cf6ef53b8358baecbd1141b8fb6db6cb12e95805984edaba80cc4f115ce6",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f137",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630ec9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "delegatecallBasic_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "16c74a7bdc7c5dbd27196eaa3900716251f4609b0c5a0262392316f1f25e1e89",
-                    "mixHash" : "59f16e84528a6e326f75c5f0923478c45a7f40de5b294e46d93701eb0be65b11",
-                    "nonce" : "a9a1b29fccece63c",
+                    "hash" : "0x844e48185ddb89c8b53315983a9d43b8ccf440ef19a945b298982662181f83b3",
+                    "mixHash" : "0xff4103becce889f80ff95e6d61b7cdcde38c99e20e4b701aa059d67248faa3c2",
+                    "nonce" : "0xd7d1537505f8cf2c",
                     "number" : "0x01",
-                    "parentHash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
-                    "stateRoot" : "7940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85",
+                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+                    "receiptTrie" : "0x5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
+                    "stateRoot" : "0x7940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a059f16e84528a6e326f75c5f0923478c45a7f40de5b294e46d93701eb0be65b1188a9a1b29fccece63cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ff4103becce889f80ff95e6d61b7cdcde38c99e20e4b701aa059d67248faa3c288d7d1537505f8cf2cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "16c74a7bdc7c5dbd27196eaa3900716251f4609b0c5a0262392316f1f25e1e89",
+        "lastblockhash" : "0x844e48185ddb89c8b53315983a9d43b8ccf440ef19a945b298982662181f83b3",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "delegatecallBasic_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xeea3",
-                    "hash" : "217ab6f356b13e82b39145f87ca2c30f2fbdb936a535da6a963956233143f7bc",
-                    "mixHash" : "aa8f73fae58a15443adf7e6e267981377d75aecd4c33f293dcc2489174fb99d6",
-                    "nonce" : "43ab3eaeee3d6f74",
+                    "hash" : "0x8fd43ec626a08f717c2bf11eba8fba400f20b3608e923548bdf66e58778a1505",
+                    "mixHash" : "0x630fffafdebb8bc3e93d2bfec68945f8f832cea4b5f211c16fef9f79f55f1dac",
+                    "nonce" : "0x963113045b8d3cf3",
                     "number" : "0x01",
-                    "parentHash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
-                    "stateRoot" : "ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936",
+                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+                    "receiptTrie" : "0x356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
+                    "stateRoot" : "0xae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a0aa8f73fae58a15443adf7e6e267981377d75aecd4c33f293dcc2489174fb99d68843ab3eaeee3d6f74f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a0630fffafdebb8bc3e93d2bfec68945f8f832cea4b5f211c16fef9f79f55f1dac88963113045b8d3cf3f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -385,28 +405,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "217ab6f356b13e82b39145f87ca2c30f2fbdb936a535da6a963956233143f7bc",
+        "lastblockhash" : "0x8fd43ec626a08f717c2bf11eba8fba400f20b3608e923548bdf66e58778a1505",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -415,46 +435,174 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4eea3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a763115d",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallBasic_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf137",
+                    "hash" : "0x065b0a6913084ad9d51ad7606ee8a8a208d532e538ec6c534d1cb7b842d79a91",
+                    "mixHash" : "0x4240b4417634d59985aace26d00da855cb4bf106fdd9c841292a89e9ddee2baf",
+                    "nonce" : "0x9f608f23c5d899fd",
+                    "number" : "0x01",
+                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+                    "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
+                    "stateRoot" : "0xcc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a04240b4417634d59985aace26d00da855cb4bf106fdd9c841292a89e9ddee2baf889f608f23c5d899fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x065b0a6913084ad9d51ad7606ee8a8a208d532e538ec6c534d1cb7b842d79a91",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f137",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630ec9",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
index e0f8ddc1e..02afe3f76 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallEmptycontract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "1fb8017d1286c1d6c9bd848b4b2e212e44ef5a75edeacc08aed32c8ede8e6848",
-                    "mixHash" : "c0d060b2a908588a8d50ce208eb7d3a9c476fb045c7f2fdee15e0ee1a77a0131",
-                    "nonce" : "73172f491e5982ec",
+                    "hash" : "0xdfaaba3b60dc4574b0295a8a5c7a099096c29994a30822f1be88032afa6fa834",
+                    "mixHash" : "0x4d866402d99033ef0b4864445d127d16aec3573e616671538facd857def2a668",
+                    "nonce" : "0xeee9642ffe1b60d7",
                     "number" : "0x01",
-                    "parentHash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
-                    "stateRoot" : "4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
+                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
+                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0c0d060b2a908588a8d50ce208eb7d3a9c476fb045c7f2fdee15e0ee1a77a01318873172f491e5982ecf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a04d866402d99033ef0b4864445d127d16aec3573e616671538facd857def2a66888eee9642ffe1b60d7f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1fb8017d1286c1d6c9bd848b4b2e212e44ef5a75edeacc08aed32c8ede8e6848",
+        "lastblockhash" : "0xdfaaba3b60dc4574b0295a8a5c7a099096c29994a30822f1be88032afa6fa834",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
@@ -68,32 +73,32 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a2ff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1025e1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -101,36 +106,41 @@
         }
     },
     "delegatecallEmptycontract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "ce98141396926b17d3e4b5cb309f724cf7f4c01509e2253f711402195f20ab10",
-                    "mixHash" : "15250482e39d5ffc227f1b23144be1b5ef4034c6b3eb6634ddf2d3421cd63d68",
-                    "nonce" : "40de2ddce401af24",
+                    "hash" : "0x6e814223009978eca9f53cccfbfaa6c3f4f0928b21a450fabd278de49622e2ee",
+                    "mixHash" : "0x658486081afb725a85dfae5c63f233db66bfcf631b352ee11440df434e673653",
+                    "nonce" : "0x2dbeedd12c36fa36",
                     "number" : "0x01",
-                    "parentHash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
-                    "stateRoot" : "4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
+                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
+                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a015250482e39d5ffc227f1b23144be1b5ef4034c6b3eb6634ddf2d3421cd63d688840de2ddce401af24f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0658486081afb725a85dfae5c63f233db66bfcf631b352ee11440df434e673653882dbeedd12c36fa36f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -140,28 +150,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ce98141396926b17d3e4b5cb309f724cf7f4c01509e2253f711402195f20ab10",
+        "lastblockhash" : "0x6e814223009978eca9f53cccfbfaa6c3f4f0928b21a450fabd278de49622e2ee",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
@@ -169,32 +179,32 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a2ff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1025e1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -202,36 +212,41 @@
         }
     },
     "delegatecallEmptycontract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x019a54",
-                    "hash" : "728cf92f6879f7493eb3041d82e629f71f34cb49bb41d9317ff6ab5576ef669d",
-                    "mixHash" : "f7694506fb48ffcfb13df6dea5baa1724077be0cb0801628d5b660c768597e0f",
-                    "nonce" : "4da4c845b678151d",
+                    "hash" : "0xf73be295148879929aa2796e0004d9cb0df77e48384d460ccda286d5ffc3f9db",
+                    "mixHash" : "0xdb288044a385d2de3c38a64ca50fbac38fc22c8859420fd96d8e4d229cb0b0c2",
+                    "nonce" : "0x7130cd573aba6361",
                     "number" : "0x01",
-                    "parentHash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
-                    "stateRoot" : "dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1",
+                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+                    "receiptTrie" : "0xee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
+                    "stateRoot" : "0xdae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0f7694506fb48ffcfb13df6dea5baa1724077be0cb0801628d5b660c768597e0f884da4c845b678151df862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0db288044a385d2de3c38a64ca50fbac38fc22c8859420fd96d8e4d229cb0b0c2887130cd573aba6361f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -241,60 +256,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "728cf92f6879f7493eb3041d82e629f71f34cb49bb41d9317ff6ab5576ef669d",
+        "lastblockhash" : "0xf73be295148879929aa2796e0004d9cb0df77e48384d460ccda286d5ffc3f9db",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f59a54",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f2e8c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -302,36 +317,41 @@
         }
     },
     "delegatecallEmptycontract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa06b",
-                    "hash" : "18c3bc471845217e344258f7e41b6e5c9359f0b07dc0b750ff8076565d018f99",
-                    "mixHash" : "16eb6e46ff8e3f494fdd2ff1b1100e982994e03cef13ef0b635c327c7c53ac52",
-                    "nonce" : "1bba9b01b14c84b6",
+                    "hash" : "0x2a3e7d836b25dfa18295adb9ba61fb62ab83a0e2658a302efe2c12bb92f48bf8",
+                    "mixHash" : "0x4bf37e56c245f9b017c92714d35f31dca63b765c01d24406fa9cc7a6c2ebd083",
+                    "nonce" : "0xfbae949eb4167ee3",
                     "number" : "0x01",
-                    "parentHash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
-                    "stateRoot" : "8ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadd",
+                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+                    "receiptTrie" : "0xe1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
+                    "stateRoot" : "0x8ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadd",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a016eb6e46ff8e3f494fdd2ff1b1100e982994e03cef13ef0b635c327c7c53ac52881bba9b01b14c84b6f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a04bf37e56c245f9b017c92714d35f31dca63b765c01d24406fa9cc7a6c2ebd08388fbae949eb4167ee3f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
                         "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -341,28 +361,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "18c3bc471845217e344258f7e41b6e5c9359f0b07dc0b750ff8076565d018f99",
+        "lastblockhash" : "0x2a3e7d836b25dfa18295adb9ba61fb62ab83a0e2658a302efe2c12bb92f48bf8",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
@@ -370,32 +390,145 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a06b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x102875",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallEmptycontract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xa2ff",
+                    "hash" : "0x4d326d5110b2cd0506fd01713f0d8c75ba9bc7527e27ad602931230de48b5c65",
+                    "mixHash" : "0x413fe8e3e724b7d8abc30fa010a1b89b1bc3c9ceb961beb55cd5d92f3667b5d0",
+                    "nonce" : "0xdeff31ce41338bea",
+                    "number" : "0x01",
+                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+                    "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
+                    "stateRoot" : "0x31ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0413fe8e3e724b7d8abc30fa010a1b89b1bc3c9ceb961beb55cd5d92f3667b5d088deff31ce41338beaf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x019a54",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
+                        "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4d326d5110b2cd0506fd01713f0d8c75ba9bc7527e27ad602931230de48b5c65",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a2ff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1025e1",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
index cd127d1ea..7ea99c7f3 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "77449798f132437fc9a64556fcb29e2138a9d63943ed03a469ad4b6382b579d9",
-                    "mixHash" : "492d6f55fc8e98ae55ae801f238d640a13d32f4a71e20f07eedc523a8757c1a2",
-                    "nonce" : "1ab83e1323202972",
+                    "hash" : "0x0170fd293d16f7077b1c4e0182500f5db18b5075477ed7acf7a94cca46a47610",
+                    "mixHash" : "0x1eb2a34ef9e114159ada6551a85b19c22df22577454bfc95345c6b47085e4842",
+                    "nonce" : "0x1527dfe38f1a35bc",
                     "number" : "0x01",
-                    "parentHash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
-                    "stateRoot" : "517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03a",
+                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+                    "receiptTrie" : "0x03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
+                    "stateRoot" : "0x517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0492d6f55fc8e98ae55ae801f238d640a13d32f4a71e20f07eedc523a8757c1a2881ab83e1323202972f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a01eb2a34ef9e114159ada6551a85b19c22df22577454bfc95345c6b47085e4842881527dfe38f1a35bcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,68 +44,68 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "77449798f132437fc9a64556fcb29e2138a9d63943ed03a469ad4b6382b579d9",
+        "lastblockhash" : "0x0170fd293d16f7077b1c4e0182500f5db18b5075477ed7acf7a94cca46a47610",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfdfe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -108,36 +113,41 @@
         }
     },
     "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "bb5f1607a17df2cc1ca5a00187e97ea21996d8f67bb9780d95a6e8a98a05e667",
-                    "mixHash" : "ad198c479f32161a6bfe6ab99c64cebf5d4de2f1b3039242f8ce49d77dc77bea",
-                    "nonce" : "ed493903d2d3c633",
+                    "hash" : "0xae993ce107d22e3ed853aa479eee567eb2993c2518a21b181a009049b19cab72",
+                    "mixHash" : "0xa49b04566fcadf84e2f307409af8aa9ac2e38c294eb51303d6d7b7290c95ae2f",
+                    "nonce" : "0xb95fbc5e0d0ab6d4",
                     "number" : "0x01",
-                    "parentHash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
-                    "stateRoot" : "25b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0a",
+                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+                    "receiptTrie" : "0x26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
+                    "stateRoot" : "0x25b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0ad198c479f32161a6bfe6ab99c64cebf5d4de2f1b3039242f8ce49d77dc77bea88ed493903d2d3c633f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0a49b04566fcadf84e2f307409af8aa9ac2e38c294eb51303d6d7b7290c95ae2f88b95fbc5e0d0ab6d4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -147,68 +157,68 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bb5f1607a17df2cc1ca5a00187e97ea21996d8f67bb9780d95a6e8a98a05e667",
+        "lastblockhash" : "0xae993ce107d22e3ed853aa479eee567eb2993c2518a21b181a009049b19cab72",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfdfe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -216,36 +226,41 @@
         }
     },
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "b35a7df46776db7b932f179aa7d06362b32c192db5e009fd6e7085d38e7f4c33",
-                    "mixHash" : "d51b77b282557d6e7d13c2fc1c7ec11fc916aebeba80fa4b63964431dc93709e",
-                    "nonce" : "ef0fba4fda56bc1c",
+                    "hash" : "0xac80e533a588862b2a76613b18cdbc5692af7eff3432951d99db8ef08fd2cfcb",
+                    "mixHash" : "0xbd38ada9f04bac72c42888bf9999ff1260b4f3826a6cc791e83591aa12708ac7",
+                    "nonce" : "0xfc9ece3bc04b8ab8",
                     "number" : "0x01",
-                    "parentHash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
-                    "stateRoot" : "1b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1",
+                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+                    "receiptTrie" : "0xcacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
+                    "stateRoot" : "0x1b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0d51b77b282557d6e7d13c2fc1c7ec11fc916aebeba80fa4b63964431dc93709e88ef0fba4fda56bc1cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0bd38ada9f04bac72c42888bf9999ff1260b4f3826a6cc791e83591aa12708ac788fc9ece3bc04b8ab8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -255,60 +270,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b35a7df46776db7b932f179aa7d06362b32c192db5e009fd6e7085d38e7f4c33",
+        "lastblockhash" : "0xac80e533a588862b2a76613b18cdbc5692af7eff3432951d99db8ef08fd2cfcb",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fae9d9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fba1627",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -316,36 +331,41 @@
         }
     },
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8c",
-                    "hash" : "bdf913ca014d13a1078b399b5dca8d74153f9e4d6afe223d27628ad037a67ed4",
-                    "mixHash" : "c4b5a8c94b3cd03f0ca8aff71ea323cba21a1904da0ecc7267cce42b7bd681b5",
-                    "nonce" : "2078eb4e3626927f",
+                    "hash" : "0x0a76db589cd666a24a68c85f2bcf763523edf5b21fb672481602d840c0d395af",
+                    "mixHash" : "0xd37717aab9d582d354a70ae7bffb324654ae1207ecdb6b8dad91de7fdf494b1f",
+                    "nonce" : "0xc0d639b49307242b",
                     "number" : "0x01",
-                    "parentHash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
-                    "stateRoot" : "c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5e",
+                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+                    "receiptTrie" : "0x67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
+                    "stateRoot" : "0xc70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a0c4b5a8c94b3cd03f0ca8aff71ea323cba21a1904da0ecc7267cce42b7bd681b5882078eb4e3626927ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a0d37717aab9d582d354a70ae7bffb324654ae1207ecdb6b8dad91de7fdf494b1f88c0d639b49307242bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -355,68 +375,188 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bdf913ca014d13a1078b399b5dca8d74153f9e4d6afe223d27628ad037a67ed4",
+        "lastblockhash" : "0x0a76db589cd666a24a68c85f2bcf763523edf5b21fb672481602d840c0d395af",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51d8c",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbfe274",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x012020",
+                    "hash" : "0x693860945de4b14e0ea86c66270d1f8dc15c31be94f76dc56ff65a2e803275ee",
+                    "mixHash" : "0x91eb9e5c0988961df072fd82cb1db0e38d22e6a2aa09afa6f2988b0e86f6ecb2",
+                    "nonce" : "0x449a71b166546985",
+                    "number" : "0x01",
+                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+                    "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
+                    "stateRoot" : "0xbbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a091eb9e5c0988961df072fd82cb1db0e38d22e6a2aa09afa6f2988b0e86f6ecb288449a71b166546985f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x693860945de4b14e0ea86c66270d1f8dc15c31be94f76dc56ff65a2e803275ee",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52020",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbfdfe0",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
index 958d1ea5a..4a4846c78 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "bf9e6ea875bdffffeaa05f92fda7dd06e7c7a8bf7bed0fc9b6eb4398f7fd461b",
-                    "mixHash" : "97c6567fff26f7c91a8e941e13cbc4dac4bb67f7c60d1bed48b935aed3ae8efe",
-                    "nonce" : "030ae639e2a5b630",
+                    "hash" : "0x0de19852846bef2a506e1665d1d859432bffef36ef0c54caf527a13f9aacda38",
+                    "mixHash" : "0x082a4d708bbe3fb2329c4b67fdb04014bd12f69844600bc456fd27dcff378329",
+                    "nonce" : "0xe7d34e802ac677cf",
                     "number" : "0x01",
-                    "parentHash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
-                    "stateRoot" : "acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9",
+                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+                    "receiptTrie" : "0xd8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
+                    "stateRoot" : "0xacf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a097c6567fff26f7c91a8e941e13cbc4dac4bb67f7c60d1bed48b935aed3ae8efe88030ae639e2a5b630f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0082a4d708bbe3fb2329c4b67fdb04014bd12f69844600bc456fd27dcff37832988e7d34e802ac677cff862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x025608",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
                         "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,37 +44,37 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bf9e6ea875bdffffeaa05f92fda7dd06e7c7a8bf7bed0fc9b6eb4398f7fd461b",
+        "lastblockhash" : "0x0de19852846bef2a506e1665d1d859432bffef36ef0c54caf527a13f9aacda38",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x02" : "0x01",
@@ -77,46 +82,46 @@
                     "0x0b" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5bc6b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf4395",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -124,36 +129,41 @@
         }
     },
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "21180a266671e189e3b730f7a8c348292d8c63e4300cd76a6f63f6ab5fe71207",
-                    "mixHash" : "e889de06827f27e30c5346b67951d67c8c4a68589c5dfffa95bd60cbe7ce37ca",
-                    "nonce" : "b8bf7c803983fd36",
+                    "hash" : "0x3e9f9861b7eddae068c88d70ff8b47e8f174d9a041b8e3e93f12e2d987802fa1",
+                    "mixHash" : "0xb31ca48f17b62f71a3230e4a3816d24e4b24956b3f582bb193cd386c9be8b3eb",
+                    "nonce" : "0x6486ba184ed1f83a",
                     "number" : "0x01",
-                    "parentHash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
-                    "stateRoot" : "ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3",
+                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+                    "receiptTrie" : "0x9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
+                    "stateRoot" : "0xecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0e889de06827f27e30c5346b67951d67c8c4a68589c5dfffa95bd60cbe7ce37ca88b8bf7c803983fd36f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0b31ca48f17b62f71a3230e4a3816d24e4b24956b3f582bb193cd386c9be8b3eb886486ba184ed1f83af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x025608",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
                         "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -163,37 +173,37 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "21180a266671e189e3b730f7a8c348292d8c63e4300cd76a6f63f6ab5fe71207",
+        "lastblockhash" : "0x3e9f9861b7eddae068c88d70ff8b47e8f174d9a041b8e3e93f12e2d987802fa1",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x01",
@@ -201,46 +211,46 @@
                     "0x0b" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5bc6b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf4395",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -248,36 +258,41 @@
         }
     },
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "2729985d01b83655f3b8f68931c0d9575bad989c20b25cb0fe76c99c92289770",
-                    "mixHash" : "06730cec25e8bc72ed5f9391fea4e8f6ac23bdccc019187fd142aac01ec07851",
-                    "nonce" : "4659128aae4647c2",
+                    "hash" : "0x55fb61055a50043f777b10c2f363f75398e00e84a79819373b209652b13a55fa",
+                    "mixHash" : "0x5ed08a0a579979389de5adda2f11426f5682d94fb4522b2ed69e60cdec277394",
+                    "nonce" : "0x6f68ebc8f898753d",
                     "number" : "0x01",
-                    "parentHash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
-                    "stateRoot" : "cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
+                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
+                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a006730cec25e8bc72ed5f9391fea4e8f6ac23bdccc019187fd142aac01ec07851884659128aae4647c2f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a05ed08a0a579979389de5adda2f11426f5682d94fb4522b2ed69e60cdec277394886f68ebc8f898753df862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x025608",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
                         "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -287,74 +302,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2729985d01b83655f3b8f68931c0d9575bad989c20b25cb0fe76c99c92289770",
+        "lastblockhash" : "0x55fb61055a50043f777b10c2f363f75398e00e84a79819373b209652b13a55fa",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f65608",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbea9f8",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -362,36 +377,41 @@
         }
     },
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "a6f43f15d3ce40e845c1aba146f69535f8ad1a03f6fe0f2971abe8d5cfb8a55a",
-                    "mixHash" : "d218e41d79a226b2ffa6a60e626ce4f62a149f0e841f3bf848c144dbd7e50422",
-                    "nonce" : "1d2ed32024f9cc0c",
+                    "hash" : "0x1c2f8aa78c9e4dd6c61bbe09a0454e7c2f0fb559cd40feed29c2025889d4c19e",
+                    "mixHash" : "0x3718efcec5fff83aeb8efd134f55a437b7ac1e780da38ef266913e41d80cd182",
+                    "nonce" : "0xaf78736bceaff12a",
                     "number" : "0x01",
-                    "parentHash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
-                    "stateRoot" : "cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
+                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
+                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0d218e41d79a226b2ffa6a60e626ce4f62a149f0e841f3bf848c144dbd7e50422881d2ed32024f9cc0cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a03718efcec5fff83aeb8efd134f55a437b7ac1e780da38ef266913e41d80cd18288af78736bceaff12af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x025608",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
                         "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -401,74 +421,210 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a6f43f15d3ce40e845c1aba146f69535f8ad1a03f6fe0f2971abe8d5cfb8a55a",
+        "lastblockhash" : "0x1c2f8aa78c9e4dd6c61bbe09a0454e7c2f0fb559cd40feed29c2025889d4c19e",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f65608",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbea9f8",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01bc6b",
+                    "hash" : "0xb92261bfe458338fc6b0b327bec6a5ec38c904fed2fe0c49cccd19d69add359e",
+                    "mixHash" : "0x602725e6b4a3de471a4833e89fc0966cce0653ee48adcefc8219a92a9c2a2cd1",
+                    "nonce" : "0xa0bd567b38584dfb",
+                    "number" : "0x01",
+                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+                    "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
+                    "stateRoot" : "0x5fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001ba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0602725e6b4a3de471a4833e89fc0966cce0653ee48adcefc8219a92a9c2a2cd188a0bd567b38584dfbf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x025608",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
+                        "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb92261bfe458338fc6b0b327bec6a5ec38c904fed2fe0c49cccd19d69add359e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270b",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x0a" : "0x01",
+                    "0x0b" : "0x1000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5bc6b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf4395",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x6001600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
index cb6d336a8..14e306272 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallInInitcodeToExistingContract_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "82c1f1f519cb7bb6a67e8d43dd8ca7caf49722631b1f808f2d15b3ac5360b24b",
-                    "mixHash" : "09ec387460dc82c60934c3240d3e914efc11003ced5975a1ed2688c1e78cff9d",
-                    "nonce" : "a7b617dc95087a05",
+                    "hash" : "0x2e1a921ba3f96ed8cf3ff16a9c3cb1f37d18853bc1af5b16c710d0bdb17612f9",
+                    "mixHash" : "0x350f82262436b5d3f71a0c3113072ebd685a3b7c0c2f00dfdca54d4b84556b74",
+                    "nonce" : "0xdf94d0390bc1f359",
                     "number" : "0x01",
-                    "parentHash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
-                    "stateRoot" : "aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983",
+                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+                    "receiptTrie" : "0x89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
+                    "stateRoot" : "0xaa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a009ec387460dc82c60934c3240d3e914efc11003ced5975a1ed2688c1e78cff9d88a7b617dc95087a05f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0350f82262436b5d3f71a0c3113072ebd685a3b7c0c2f00dfdca54d4b84556b7488df94d0390bc1f359f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,44 +44,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "82c1f1f519cb7bb6a67e8d43dd8ca7caf49722631b1f808f2d15b3ac5360b24b",
+        "lastblockhash" : "0x2e1a921ba3f96ed8cf3ff16a9c3cb1f37d18853bc1af5b16c710d0bdb17612f9",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
@@ -85,53 +90,53 @@
                     "0x0b" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60a90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbef570",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -139,36 +144,41 @@
         }
     },
     "delegatecallInInitcodeToExistingContract_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "96de32047189ebcc7effb1f562db332be8c0ba8e29353aa3c306e9d21914450d",
-                    "mixHash" : "af8e90f8849a483af17b94435b9eb0f958afda9d9e797b66602814f24d603a75",
-                    "nonce" : "5c0f0b5f8f6a3a0b",
+                    "hash" : "0x3607f8d64e4004cfbe68854885533f255b22dfcf680224744690264eb1185608",
+                    "mixHash" : "0xd965747873fe8fee7fc2c25a8dd029d0a4fc8bf44a500321cf9b4d9000518b7b",
+                    "nonce" : "0x35424095c3db087e",
                     "number" : "0x01",
-                    "parentHash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
-                    "stateRoot" : "4dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55",
+                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+                    "receiptTrie" : "0x937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
+                    "stateRoot" : "0x4dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0af8e90f8849a483af17b94435b9eb0f958afda9d9e797b66602814f24d603a75885c0f0b5f8f6a3a0bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0d965747873fe8fee7fc2c25a8dd029d0a4fc8bf44a500321cf9b4d9000518b7b8835424095c3db087ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -178,44 +188,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "96de32047189ebcc7effb1f562db332be8c0ba8e29353aa3c306e9d21914450d",
+        "lastblockhash" : "0x3607f8d64e4004cfbe68854885533f255b22dfcf680224744690264eb1185608",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
@@ -224,53 +234,53 @@
                     "0x0b" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f60a90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbef570",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -278,36 +288,41 @@
         }
     },
     "delegatecallInInitcodeToExistingContract_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "798ae88d66719e165b36155eab41fea41efbcbdbecf1b49e0611e22fc1cd6040",
-                    "mixHash" : "34d5adb1090f3f88bf2e7c1529d556d996a6aafe360c18a8fadebcbc15b48876",
-                    "nonce" : "376aee9e3bd498fa",
+                    "hash" : "0xcfb534ca693421167f73f23d71075e550837406fc71c683d15b28ff6196f1ecf",
+                    "mixHash" : "0xccc682ee987b8c7e064d9c6d99afa570c1b7708f75824a61be9971c42d0ffa31",
+                    "nonce" : "0xac8632ae509f1441",
                     "number" : "0x01",
-                    "parentHash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
-                    "stateRoot" : "834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1",
+                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+                    "receiptTrie" : "0x640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
+                    "stateRoot" : "0x834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a034d5adb1090f3f88bf2e7c1529d556d996a6aafe360c18a8fadebcbc15b4887688376aee9e3bd498faf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0ccc682ee987b8c7e064d9c6d99afa570c1b7708f75824a61be9971c42d0ffa3188ac8632ae509f1441f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -317,88 +332,88 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "798ae88d66719e165b36155eab41fea41efbcbdbecf1b49e0611e22fc1cd6040",
+        "lastblockhash" : "0xcfb534ca693421167f73f23d71075e550837406fc71c683d15b28ff6196f1ecf",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fae9d9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fba1627",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -406,36 +421,41 @@
         }
     },
     "delegatecallInInitcodeToExistingContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0207fc",
-                    "hash" : "fbb43140bd8f5d491caed330062e83556ebdcb0d90108d223701c4ddf26625f1",
-                    "mixHash" : "bf8382e645dcadce9806408f99a73642d49fbae3b7337cd478b78d5cd3a62872",
-                    "nonce" : "076f369eaff278c6",
+                    "hash" : "0x2227fc7dfca0570913be3a1d754070d5e8245c213cb2dd3771cca5dd52909545",
+                    "mixHash" : "0x18baa5f4adbfbce23305659d2704ca3e20ca5a4fc004d9e3bea9db4f042f0847",
+                    "nonce" : "0xc9511283ad50c8ec",
                     "number" : "0x01",
-                    "parentHash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
-                    "stateRoot" : "b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792b",
+                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+                    "receiptTrie" : "0x2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
+                    "stateRoot" : "0xb3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a0bf8382e645dcadce9806408f99a73642d49fbae3b7337cd478b78d5cd3a6287288076f369eaff278c6f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a018baa5f4adbfbce23305659d2704ca3e20ca5a4fc004d9e3bea9db4f042f084788c9511283ad50c8ecf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -445,44 +465,44 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fbb43140bd8f5d491caed330062e83556ebdcb0d90108d223701c4ddf26625f1",
+        "lastblockhash" : "0x2227fc7dfca0570913be3a1d754070d5e8245c213cb2dd3771cca5dd52909545",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
@@ -491,53 +511,204 @@
                     "0x0b" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607fc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbef804",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600b55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallInInitcodeToExistingContract_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x020a90",
+                    "hash" : "0x7ed128038fc8a4a07a557761d6808bd70a9cd63d06dbc092672db80b28b86700",
+                    "mixHash" : "0xcf26f1e4d49c99f85733fe4c15e1e141a2accbc9a7637fb4484dc3b415f6dad8",
+                    "nonce" : "0xa757edcd13799268",
+                    "number" : "0x01",
+                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+                    "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
+                    "stateRoot" : "0xf284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ada074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0cf26f1e4d49c99f85733fe4c15e1e141a2accbc9a7637fb4484dc3b415f6dad888a757edcd13799268f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7ed128038fc8a4a07a557761d6808bd70a9cd63d06dbc092672db80b28b86700",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x1000000000000000000000000000000000000000",
+                    "0x02" : "0x01",
+                    "0x0b" : "0x1000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f60a90",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600b55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbef570",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x03e8",
                 "code" : "0x6460016000556000526005601b6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
                 "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
index 4157b8598..f56854888 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallOOGinCall_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0ffa3a21a3f324c70f0fcda538e23bbf5ab266ae095f1503fe7f2e201b57f82e",
-                    "mixHash" : "7c6b53889523f179e12d752d7579e40fb8f5fffcd15b4b31f3c1997782946a57",
-                    "nonce" : "d0200b062725c939",
+                    "hash" : "0x2c7b1f66832979a394263138b1de8008b0a65f428305262d50123f75924811a3",
+                    "mixHash" : "0x8309e215924d61cf1bdee0c3af85089a6b3335c5d55efab336fb1cdd0eebcc18",
+                    "nonce" : "0x5988692ae135754e",
                     "number" : "0x01",
-                    "parentHash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
-                    "stateRoot" : "008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
+                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
+                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a07c6b53889523f179e12d752d7579e40fb8f5fffcd15b4b31f3c1997782946a5788d0200b062725c939f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a08309e215924d61cf1bdee0c3af85089a6b3335c5d55efab336fb1cdd0eebcc18885988692ae135754ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "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" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0ffa3a21a3f324c70f0fcda538e23bbf5ab266ae095f1503fe7f2e201b57f82e",
+        "lastblockhash" : "0x2c7b1f66832979a394263138b1de8008b0a65f428305262d50123f75924811a3",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
@@ -68,46 +73,46 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ca0f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76335f1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -115,36 +120,41 @@
         }
     },
     "delegatecallOOGinCall_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "af4cde4d7a0992bc73820ce1103af68775893490c8d47991ea476db1e0c29ebf",
-                    "mixHash" : "42f1ce93b8e50512ada037474d2c85cd78cf2c4a36f937e2d2f664ec43489af3",
-                    "nonce" : "290885e18d1ee2d9",
+                    "hash" : "0x1f2af933161c593f0f4263c3f7544d07fb98638b1c955ee367a3f05179236105",
+                    "mixHash" : "0x15636f74b60c7bfb0703a9370e79ceb4aea415d09c43e048a0f0656e599ef51e",
+                    "nonce" : "0x403ac567eda9f214",
                     "number" : "0x01",
-                    "parentHash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
-                    "stateRoot" : "008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
+                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
+                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a042f1ce93b8e50512ada037474d2c85cd78cf2c4a36f937e2d2f664ec43489af388290885e18d1ee2d9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a015636f74b60c7bfb0703a9370e79ceb4aea415d09c43e048a0f0656e599ef51e88403ac567eda9f214f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -154,28 +164,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "af4cde4d7a0992bc73820ce1103af68775893490c8d47991ea476db1e0c29ebf",
+        "lastblockhash" : "0x1f2af933161c593f0f4263c3f7544d07fb98638b1c955ee367a3f05179236105",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
@@ -183,46 +193,46 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ca0f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76335f1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -230,36 +240,41 @@
         }
     },
     "delegatecallOOGinCall_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "3c9aa26a1e3852924216f8193c059c970ec48a585a5311b99975a287b7e1f441",
-                    "mixHash" : "8c8fa3f4ce6670fe83a572ceb37e5b4cc7fc483416d43b1946636b3670154479",
-                    "nonce" : "eb6b8dc6cf9a03c7",
+                    "hash" : "0x5979e4217bc57eab5aeb857e558d109733dffd6f9a09869c91f37833983afddd",
+                    "mixHash" : "0x8b2dd1f3a69e8869f1b60a5066ef4fb2fed2df4c3e3500c8c8f1a3acb569b038",
+                    "nonce" : "0x6e41aa0964641ad7",
                     "number" : "0x01",
-                    "parentHash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
-                    "stateRoot" : "8865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815",
+                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+                    "receiptTrie" : "0x8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
+                    "stateRoot" : "0x8865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08c8fa3f4ce6670fe83a572ceb37e5b4cc7fc483416d43b1946636b367015447988eb6b8dc6cf9a03c7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08b2dd1f3a69e8869f1b60a5066ef4fb2fed2df4c3e3500c8c8f1a3acb569b038886e41aa0964641ad7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -269,74 +284,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3c9aa26a1e3852924216f8193c059c970ec48a585a5311b99975a287b7e1f441",
+        "lastblockhash" : "0x5979e4217bc57eab5aeb857e558d109733dffd6f9a09869c91f37833983afddd",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -344,36 +359,41 @@
         }
     },
     "delegatecallOOGinCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xc77b",
-                    "hash" : "81f592da09daff0f8f8906d26581c2d5079e5174c7835886f75e94b490636f5c",
-                    "mixHash" : "ce05e54fb29b38ddb92fbf6c4fc6a7c10933f8959c1b624404de21b7bda48f32",
-                    "nonce" : "aa50e94dbff286db",
+                    "hash" : "0x2e0022a8df719b46beb69cf3582c9af25f43b703337296bb062f02d6b3ac1fa3",
+                    "mixHash" : "0x7c836441ebbea02b8791783b41627d2b5f8d4cca53fe6c8e9f2953a3770d56ef",
+                    "nonce" : "0x9a62a4e85d389115",
                     "number" : "0x01",
-                    "parentHash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
-                    "stateRoot" : "ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3eba",
+                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+                    "receiptTrie" : "0x6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
+                    "stateRoot" : "0xba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3eba",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a0ce05e54fb29b38ddb92fbf6c4fc6a7c10933f8959c1b624404de21b7bda48f3288aa50e94dbff286dbf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a07c836441ebbea02b8791783b41627d2b5f8d4cca53fe6c8e9f2953a3770d56ef889a62a4e85d389115f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -383,28 +403,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "81f592da09daff0f8f8906d26581c2d5079e5174c7835886f75e94b490636f5c",
+        "lastblockhash" : "0x2e0022a8df719b46beb69cf3582c9af25f43b703337296bb062f02d6b3ac1fa3",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
@@ -412,46 +432,173 @@
                     "0x00" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c77b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7633885",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallOOGinCall_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xca0f",
+                    "hash" : "0xcbe59c98ff47140acaa0d8331a2f9e770dfd907c53d0f831bcfdbf61651fa920",
+                    "mixHash" : "0xf5404320dcd76e1d8ea0e189efbae41d10386fe8b16000b5f33ccf7525735612",
+                    "nonce" : "0x03e0392d7f9cee40",
+                    "number" : "0x01",
+                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+                    "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
+                    "stateRoot" : "0xec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0f5404320dcd76e1d8ea0e189efbae41d10386fe8b16000b5f33ccf75257356128803e0392d7f9cee40f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcbe59c98ff47140acaa0d8331a2f9e770dfd907c53d0f831bcfdbf61651fa920",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ca0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76335f1",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
index 2079f7337..70b1514f7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallSenderCheck_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "f9e2b511eefdb1e440f14d0b1091fd69f7aa3916978b86bec01a28f7a5275603",
-                    "mixHash" : "fe0211e4422f6c51324f831cdfcc9e1f7df9a59a6075597d34b77777ae13df66",
-                    "nonce" : "03671719b086accf",
+                    "hash" : "0x44f29ea891adcc64046aa497e052c5dda36b70bf5c6f3c40b8f8999c7064d6b5",
+                    "mixHash" : "0xb559bc69660b57c852c436509049d5f5dc0d0ed48df6ce33d747494205de1911",
+                    "nonce" : "0x055ef8f55517fff4",
                     "number" : "0x01",
-                    "parentHash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
-                    "stateRoot" : "aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
+                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
+                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0fe0211e4422f6c51324f831cdfcc9e1f7df9a59a6075597d34b77777ae13df668803671719b086accff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0b559bc69660b57c852c436509049d5f5dc0d0ed48df6ce33d747494205de191188055ef8f55517fff4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "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" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f9e2b511eefdb1e440f14d0b1091fd69f7aa3916978b86bec01a28f7a5275603",
+        "lastblockhash" : "0x44f29ea891adcc64046aa497e052c5dda36b70bf5c6f3c40b8f8999c7064d6b5",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f124",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630edc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "delegatecallSenderCheck_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "21d6960340ac5beaf482b0586011c31bcc4475f8cdce36b15d15770b777926e9",
-                    "mixHash" : "06dd7d52e8119fb95e794391fb6a376bd2adf3cb4d53abb8fde73bcda0e25521",
-                    "nonce" : "86840ba4fb3d22fc",
+                    "hash" : "0xb776cd2825437a6e5462849a4bd39e9eb3e8502f01e41d3a44c37399b8d23eb8",
+                    "mixHash" : "0x6966c718dceb0f59aa90e139cbb4a91eb5267ba0ee9d72a9b43cfe5551012f8b",
+                    "nonce" : "0xd12faf15692a64e8",
                     "number" : "0x01",
-                    "parentHash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
-                    "stateRoot" : "aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
+                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
+                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a006dd7d52e8119fb95e794391fb6a376bd2adf3cb4d53abb8fde73bcda0e255218886840ba4fb3d22fcf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a06966c718dceb0f59aa90e139cbb4a91eb5267ba0ee9d72a9b43cfe5551012f8b88d12faf15692a64e8f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "21d6960340ac5beaf482b0586011c31bcc4475f8cdce36b15d15770b777926e9",
+        "lastblockhash" : "0xb776cd2825437a6e5462849a4bd39e9eb3e8502f01e41d3a44c37399b8d23eb8",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f124",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630edc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "delegatecallSenderCheck_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "f49461894d6aea30e31d1b00c0b21759502346d051ac412042dfb6cad17199b3",
-                    "mixHash" : "41a36512adb899b0a3d3535d0e24bd25513ff43fb678d64dda8fe47ab1031323",
-                    "nonce" : "0a4b435c39b4e878",
+                    "hash" : "0xcc77d7a8fe8e7297ff77de77e274d3f59a142447d8edc7e89d2367e7d7a28e45",
+                    "mixHash" : "0x352d1ca9c9615aa6629a6ab209d707ce61257893325eae0510e1b80b783e32c1",
+                    "nonce" : "0xdc3e8da494ee2e2a",
                     "number" : "0x01",
-                    "parentHash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
-                    "stateRoot" : "2f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66",
+                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+                    "receiptTrie" : "0x8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
+                    "stateRoot" : "0x2f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a041a36512adb899b0a3d3535d0e24bd25513ff43fb678d64dda8fe47ab1031323880a4b435c39b4e878f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0352d1ca9c9615aa6629a6ab209d707ce61257893325eae0510e1b80b783e32c188dc3e8da494ee2e2af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f49461894d6aea30e31d1b00c0b21759502346d051ac412042dfb6cad17199b3",
+        "lastblockhash" : "0xcc77d7a8fe8e7297ff77de77e274d3f59a142447d8edc7e89d2367e7d7a28e45",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "delegatecallSenderCheck_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "675ab343c7f9ada288063ee3bcdb322911ef5487038936cec30d80f40bfa7291",
-                    "mixHash" : "734970eee242283e47dd1c7592339f398a00b00e2930dda53310d64cc40137c9",
-                    "nonce" : "a5470c71dd876e36",
+                    "hash" : "0x8a53974831375d37b5a9f3d3ae85ba41150c5039e972cda63f592912723a9e7e",
+                    "mixHash" : "0xcec4a212a0e080b14f8fd01ff87137625d5908772e5af0a1d58c5c0486d4082d",
+                    "nonce" : "0x84583fa09eb7ca4e",
                     "number" : "0x01",
-                    "parentHash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
-                    "stateRoot" : "1dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795",
+                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+                    "receiptTrie" : "0x7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
+                    "stateRoot" : "0x1dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0734970eee242283e47dd1c7592339f398a00b00e2930dda53310d64cc40137c988a5470c71dd876e36f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0cec4a212a0e080b14f8fd01ff87137625d5908772e5af0a1d58c5c0486d4082d8884583fa09eb7ca4ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
                         "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -385,28 +405,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "675ab343c7f9ada288063ee3bcdb322911ef5487038936cec30d80f40bfa7291",
+        "lastblockhash" : "0x8a53974831375d37b5a9f3d3ae85ba41150c5039e972cda63f592912723a9e7e",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -415,46 +435,174 @@
                     "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7631170",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x33600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallSenderCheck_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf124",
+                    "hash" : "0x67d67041d7f2654d4bef4abb215e95da1b103aa6d4c9131e0d4e37988c400a70",
+                    "mixHash" : "0xf3db3a8bc0729f11ddbb83c7237ff73eb89e38372dbc927ca5c0ea6325f22a45",
+                    "nonce" : "0x7a3f61bff8bb911d",
+                    "number" : "0x01",
+                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
+                    "stateRoot" : "0x2c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0f3db3a8bc0729f11ddbb83c7237ff73eb89e38372dbc927ca5c0ea6325f22a45887a3f61bff8bb911df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x67d67041d7f2654d4bef4abb215e95da1b103aa6d4c9131e0d4e37988c400a70",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f124",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x33600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630edc",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x33600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
index 845413849..dc83eaf65 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecallValueCheck_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "9f192e7765844d6925c4e0e8a1c902e277c3401269875c8a6e6ddd7b1fb7020c",
-                    "mixHash" : "2ba1457f1ed9224b7c5cc327e17a5b6cf0568169b411ae988830f963b067724c",
-                    "nonce" : "11904c6866368b6e",
+                    "hash" : "0xc731c6403246dd252b8a54e24a63899d78c554c70bd64a7058d19f734b700c23",
+                    "mixHash" : "0x5ee2a546a753c6b1cda3bd18bc97c04d1aedd2e5f9cceda0cabe2e6f58ac3fa4",
+                    "nonce" : "0x80d7b86520375efa",
                     "number" : "0x01",
-                    "parentHash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
-                    "stateRoot" : "89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
+                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
+                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a02ba1457f1ed9224b7c5cc327e17a5b6cf0568169b411ae988830f963b067724c8811904c6866368b6ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a05ee2a546a753c6b1cda3bd18bc97c04d1aedd2e5f9cceda0cabe2e6f58ac3fa48880d7b86520375efaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
                         "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x17"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9f192e7765844d6925c4e0e8a1c902e277c3401269875c8a6e6ddd7b1fb7020c",
+        "lastblockhash" : "0xc731c6403246dd252b8a54e24a63899d78c554c70bd64a7058d19f734b700c23",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -69,46 +74,46 @@
                     "0x01" : "0x17"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f124",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630ec5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -116,36 +121,41 @@
         }
     },
     "delegatecallValueCheck_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "101126a9966dfc9a2d93fe38923c31ec5891e94e8b1590bee8bfe95234fbf38f",
-                    "mixHash" : "e179411a55d0882933bc9d2cb09b3814f14b2b95e9e36959cc1f9aa3ae182a9c",
-                    "nonce" : "f4dad8a83a8caff9",
+                    "hash" : "0x2432fa26b78c9798b4c1c04cb3a9bbdaaaf0cd9939cbad4d7dde9f49939c740b",
+                    "mixHash" : "0x16aa40810955ee125e6c529f40ee86e3146d2b74a450eedef82bbdf3d28a363e",
+                    "nonce" : "0xda4eca5744e30adc",
                     "number" : "0x01",
-                    "parentHash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
-                    "stateRoot" : "89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
+                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
+                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0e179411a55d0882933bc9d2cb09b3814f14b2b95e9e36959cc1f9aa3ae182a9c88f4dad8a83a8caff9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a016aa40810955ee125e6c529f40ee86e3146d2b74a450eedef82bbdf3d28a363e88da4eca5744e30adcf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
                         "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x17"
                     }
@@ -155,28 +165,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "101126a9966dfc9a2d93fe38923c31ec5891e94e8b1590bee8bfe95234fbf38f",
+        "lastblockhash" : "0x2432fa26b78c9798b4c1c04cb3a9bbdaaaf0cd9939cbad4d7dde9f49939c740b",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -185,46 +195,46 @@
                     "0x01" : "0x17"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f124",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7630ec5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -232,36 +242,41 @@
         }
     },
     "delegatecallValueCheck_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "115c048fbb23a460b0519f9a535f95fdab47836cee6aa9b173cda93ed6504ebf",
-                    "mixHash" : "1450a3fa6a884af70137791781aede5c7685276d72cae97b529dcd9e52595244",
-                    "nonce" : "aaa13f2e1d43fd4a",
+                    "hash" : "0x43898f1353989270125e989eae572e43fa371f3f661d9e87ecf5dee3f48634e8",
+                    "mixHash" : "0xfd5dbda6c0f5be5a9a2611614dabd2959aa742bdc9d62ea19e05692a68634b88",
+                    "nonce" : "0x99c89d9b3ab8d0f0",
                     "number" : "0x01",
-                    "parentHash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
-                    "stateRoot" : "41a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004c",
+                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+                    "receiptTrie" : "0xa9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
+                    "stateRoot" : "0x41a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a01450a3fa6a884af70137791781aede5c7685276d72cae97b529dcd9e5259524488aaa13f2e1d43fd4af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0fd5dbda6c0f5be5a9a2611614dabd2959aa742bdc9d62ea19e05692a68634b888899c89d9b3ab8d0f0f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
                         "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x17"
                     }
@@ -271,74 +286,74 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "115c048fbb23a460b0519f9a535f95fdab47836cee6aa9b173cda93ed6504ebf",
+        "lastblockhash" : "0x43898f1353989270125e989eae572e43fa371f3f661d9e87ecf5dee3f48634e8",
         "network" : "Frontier",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824521c6c0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7363940",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -346,36 +361,41 @@
         }
     },
     "delegatecallValueCheck_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "ee4ebae735ba8060c1feb5773a28a42ee3ab07cd3133504792df33a47e82a192",
-                    "mixHash" : "651be9423f9ebbf5dec31fbd17636ad6e131260301d09b805fd0cb80ad43ce35",
-                    "nonce" : "98f1909aea38a772",
+                    "hash" : "0xb667104569316130c73a7fd518d246245acfce3c16c56f5f8a8791fe3ef73a06",
+                    "mixHash" : "0x9c16db77e955cccb737112488f4efa7a6273058739eda8240df991858d0639d0",
+                    "nonce" : "0x51a9a66a44204c83",
                     "number" : "0x01",
-                    "parentHash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
-                    "stateRoot" : "84853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8",
+                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+                    "receiptTrie" : "0x6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
+                    "stateRoot" : "0x84853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0651be9423f9ebbf5dec31fbd17636ad6e131260301d09b805fd0cb80ad43ce358898f1909aea38a772f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a09c16db77e955cccb737112488f4efa7a6273058739eda8240df991858d0639d08851a9a66a44204c83f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
                         "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x17"
                     }
@@ -385,28 +405,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ee4ebae735ba8060c1feb5773a28a42ee3ab07cd3133504792df33a47e82a192",
+        "lastblockhash" : "0xb667104569316130c73a7fd518d246245acfce3c16c56f5f8a8791fe3ef73a06",
         "network" : "Homestead",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
@@ -415,46 +435,174 @@
                     "0x01" : "0x17"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee90",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7631159",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x34600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallValueCheck_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf124",
+                    "hash" : "0xe93457470ff0bc358a4811bee8e31223581c937b86737f3e6855ff523e54dc7e",
+                    "mixHash" : "0x4ff9d17e35f43bb95cbb09d05b398542b9824cdb657dff7fdbd3b1bf190b1811",
+                    "nonce" : "0x6d3d5d15ffcd47e9",
+                    "number" : "0x01",
+                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
+                    "stateRoot" : "0x44246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a04ff9d17e35f43bb95cbb09d05b398542b9824cdb657dff7fdbd3b1bf190b1811886d3d5d15ffcd47e9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
+                        "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x17"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe93457470ff0bc358a4811bee8e31223581c937b86737f3e6855ff523e54dc7e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640017",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x17"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f124",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x34600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630ec5",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x17",
                 "code" : "0x34600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
index b30f5f67d..592f1883f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "cf0f146b53a43dc2f09db7032263dcd5cd58a175c343137e47334cf86d86f9e0",
-                    "mixHash" : "03df9d0a922fea14702638a05ef455c5b13a4cd7f76a0b81798570fe437b4d30",
-                    "nonce" : "5b43ea8c02f7e388",
+                    "hash" : "0x9fbc397dbaa2025ee3382758a8bb8f69e939ac0078ad13af3033102172d0432c",
+                    "mixHash" : "0x8273ee695e935fcd8668fec4dad6fe8345b9dc8b678e6ec1f5bd66cba98fb0f5",
+                    "nonce" : "0xfe4654f9f95c3d01",
                     "number" : "0x01",
-                    "parentHash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
-                    "stateRoot" : "21d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145e",
+                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+                    "receiptTrie" : "0x6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
+                    "stateRoot" : "0x21d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a003df9d0a922fea14702638a05ef455c5b13a4cd7f76a0b81798570fe437b4d30885b43ea8c02f7e388f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a08273ee695e935fcd8668fec4dad6fe8345b9dc8b678e6ec1f5bd66cba98fb0f588fe4654f9f95c3d01f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,69 +44,69 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cf0f146b53a43dc2f09db7032263dcd5cd58a175c343137e47334cf86d86f9e0",
+        "lastblockhash" : "0x9fbc397dbaa2025ee3382758a8bb8f69e939ac0078ad13af3033102172d0432c",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56e45",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf91bb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -109,36 +114,41 @@
         }
     },
     "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "9b25ebece86c1239c86d2a5490c1deb24696837ff9c0164a03d1e56c8397494b",
-                    "mixHash" : "f2ef2843bdca6eaedc4dbdb248a8e6dd880648bf311383f7a7213b8e1da0e59c",
-                    "nonce" : "686075876912a4c0",
+                    "hash" : "0x76a8b1bb9c0bd487a3df0a3c14a76d8c2518f08e9b180adb7053b972a76c7a7f",
+                    "mixHash" : "0x08e9f28244b2a8f71348c383405e40a8130fcad058179c1be01da3af05a4a0da",
+                    "nonce" : "0xd40a90c8521268f8",
                     "number" : "0x01",
-                    "parentHash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
-                    "stateRoot" : "cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81",
+                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+                    "receiptTrie" : "0x03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
+                    "stateRoot" : "0xcf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0f2ef2843bdca6eaedc4dbdb248a8e6dd880648bf311383f7a7213b8e1da0e59c88686075876912a4c0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a008e9f28244b2a8f71348c383405e40a8130fcad058179c1be01da3af05a4a0da88d40a90c8521268f8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -148,69 +158,69 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "9b25ebece86c1239c86d2a5490c1deb24696837ff9c0164a03d1e56c8397494b",
+        "lastblockhash" : "0x76a8b1bb9c0bd487a3df0a3c14a76d8c2518f08e9b180adb7053b972a76c7a7f",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56e45",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf91bb",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -218,36 +228,41 @@
         }
     },
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "43e8c972d6093aaa08195ef3ef8e6aa68be947ba3e55f2389f8c988a2ce65656",
-                    "mixHash" : "5006f00900db847ad9fa9ae9b9843b15bea32f42f69b0684c6d2a83aa2d6f095",
-                    "nonce" : "b7df2c7f0e9e616a",
+                    "hash" : "0xc98a0efa970ccb428f6aeed09dcb68e9a35a33363d13725b3b294a9789b0caa9",
+                    "mixHash" : "0xcf2399596f4f3cb641a45299615eaf8021a63b57ee3b6e9e9c21dbf5fecc108a",
+                    "nonce" : "0x14fd6caa45ad9430",
                     "number" : "0x01",
-                    "parentHash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
-                    "stateRoot" : "17c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084",
+                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+                    "receiptTrie" : "0xef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
+                    "stateRoot" : "0x17c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a05006f00900db847ad9fa9ae9b9843b15bea32f42f69b0684c6d2a83aa2d6f09588b7df2c7f0e9e616af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0cf2399596f4f3cb641a45299615eaf8021a63b57ee3b6e9e9c21dbf5fecc108a8814fd6caa45ad9430f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -257,60 +272,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "43e8c972d6093aaa08195ef3ef8e6aa68be947ba3e55f2389f8c988a2ce65656",
+        "lastblockhash" : "0xc98a0efa970ccb428f6aeed09dcb68e9a35a33363d13725b3b294a9789b0caa9",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fae9d9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fba1627",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -318,36 +333,41 @@
         }
     },
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb1",
-                    "hash" : "c2ca8d8a7fec4a794f54c4db71fd0891a7f0c9fe9e29d3268268414436b8493b",
-                    "mixHash" : "93f9d2bf1f029d7dc4a23a4bc590f72f4066c4a0ce65e32041c051edb2f51034",
-                    "nonce" : "6ff66365482a83cb",
+                    "hash" : "0xb84bc8bda10506ddcd2da660debf965bf251a0043f2ab0ad7ce5ccc546b6f1bc",
+                    "mixHash" : "0x9672985d541cc3069b39a70f8fcc53de4002031a62a2566b4f80852ff400b4ab",
+                    "nonce" : "0xc09b9cc98a4cec3d",
                     "number" : "0x01",
-                    "parentHash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
-                    "stateRoot" : "a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0",
+                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+                    "receiptTrie" : "0xdb63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
+                    "stateRoot" : "0xa11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a093f9d2bf1f029d7dc4a23a4bc590f72f4066c4a0ce65e32041c051edb2f51034886ff66365482a83cbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a09672985d541cc3069b39a70f8fcc53de4002031a62a2566b4f80852ff400b4ab88c09b9cc98a4cec3df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -357,69 +377,190 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c2ca8d8a7fec4a794f54c4db71fd0891a7f0c9fe9e29d3268268414436b8493b",
+        "lastblockhash" : "0xb84bc8bda10506ddcd2da660debf965bf251a0043f2ab0ad7ce5ccc546b6f1bc",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56bb1",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf944f",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x016e45",
+                    "hash" : "0x88d517f8272046db5c2848ecd8520c5a5ee76a83dce2fc2e2af20df0192eee02",
+                    "mixHash" : "0xa9ee1765c8ef45e699a27fef1e78000bda8c066b86b86d691988f642f58cfca6",
+                    "nonce" : "0x6e42e7f5ea6dce36",
+                    "number" : "0x01",
+                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+                    "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
+                    "stateRoot" : "0xe0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0a9ee1765c8ef45e699a27fef1e78000bda8c066b86b86d691988f642f58cfca6886e42e7f5ea6dce36f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x88d517f8272046db5c2848ecd8520c5a5ee76a83dce2fc2e2af20df0192eee02",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8df",
+                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x0b" : "0x01",
+                    "0x0c" : "0x1000000000000000000000000000000000000000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56e45",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf91bb",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
index 15022926b..d333f0225 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "delegatecodeDynamicCode_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028ec6",
-                    "hash" : "09c0dbfc5122774d60bcff7f96e4ca4d667def2a06672e0fbab83951baf6658d",
-                    "mixHash" : "f01d5be183b144a501ada71bab9ae4af30943724d58fffe2f1e29d43864f9305",
-                    "nonce" : "b44afb5e457f7792",
+                    "hash" : "0x196c62ffd039aafe8ab486bbaca2b339b0362191e989cd7e6886ddc1b2dff962",
+                    "mixHash" : "0x26970fe8e9db6b61b5e0c69ade9fbe093203f6d2785c4df5cef7467d769442ea",
+                    "nonce" : "0x73a52739084e13c5",
                     "number" : "0x01",
-                    "parentHash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
-                    "stateRoot" : "92b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5",
+                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+                    "receiptTrie" : "0x56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
+                    "stateRoot" : "0x92b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a0f01d5be183b144a501ada71bab9ae4af30943724d58fffe2f1e29d43864f930588b44afb5e457f7792f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a026970fe8e9db6b61b5e0c69ade9fbe093203f6d2785c4df5cef7467d769442ea8873a52739084e13c5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,37 +44,37 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "09c0dbfc5122774d60bcff7f96e4ca4d667def2a06672e0fbab83951baf6658d",
+        "lastblockhash" : "0x196c62ffd039aafe8ab486bbaca2b339b0362191e989cd7e6886ddc1b2dff962",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
@@ -78,21 +83,21 @@
                     "0x14" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f68ec6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbe713a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x00",
@@ -101,16 +106,16 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -118,36 +123,41 @@
         }
     },
     "delegatecodeDynamicCode_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "37cd769da93ab1e660aa7ca21d6f4bfa12428dcc2a78309f52c8a4aca1805d0b",
-                    "mixHash" : "ca6d08949f87a4e6ff4e1d241e525ab43662c02e0af8c9d234e2f3e39ca87b62",
-                    "nonce" : "333097d356840f29",
+                    "hash" : "0x7d7c2efcff8ee387e91c80ae833e0f2794b914bc7675ebce46a019c717b1e602",
+                    "mixHash" : "0x7aa9ffec8928cd253362cbf2e5d18c2e31be38cd0eb00a3159ecedf089397161",
+                    "nonce" : "0x57080b6792536db9",
                     "number" : "0x01",
-                    "parentHash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
-                    "stateRoot" : "ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58",
+                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+                    "receiptTrie" : "0x0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
+                    "stateRoot" : "0xec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0ca6d08949f87a4e6ff4e1d241e525ab43662c02e0af8c9d234e2f3e39ca87b6288333097d356840f29f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a07aa9ffec8928cd253362cbf2e5d18c2e31be38cd0eb00a3159ecedf0893971618857080b6792536db9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -157,76 +167,76 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "37cd769da93ab1e660aa7ca21d6f4bfa12428dcc2a78309f52c8a4aca1805d0b",
+        "lastblockhash" : "0x7d7c2efcff8ee387e91c80ae833e0f2794b914bc7675ebce46a019c717b1e602",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x02",
                 "storage" : {
                     "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
                     "0x0b" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f27b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "568a95f77b047bece6aa68843d2019332c46a585" : {
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbf0d85",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -234,36 +244,41 @@
         }
     },
     "delegatecodeDynamicCode_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "6a996d63e1859fd882dc82b28499071ce2d4136d9b08d2c866cdc1b60339054a",
-                    "mixHash" : "1fe72c1de180e9f42ec5474b52fbbf1d262c218da4b80a595d8c168db548f45c",
-                    "nonce" : "07cf43f3a66d5585",
+                    "hash" : "0x05e4d7262eb86d79f63de2c2502c295aa21de3032c935cbb04615f6d82551614",
+                    "mixHash" : "0xbeedcedde753b2682b4b9adffd3357bbd9f73820b9c1be3c268a307e60c8bd21",
+                    "nonce" : "0x3dc8b871899cc505",
                     "number" : "0x01",
-                    "parentHash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
-                    "stateRoot" : "38a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035",
+                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+                    "receiptTrie" : "0x7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
+                    "stateRoot" : "0x38a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a01fe72c1de180e9f42ec5474b52fbbf1d262c218da4b80a595d8c168db548f45c8807cf43f3a66d5585f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0beedcedde753b2682b4b9adffd3357bbd9f73820b9c1be3c268a307e60c8bd21883dc8b871899cc505f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -273,60 +288,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6a996d63e1859fd882dc82b28499071ce2d4136d9b08d2c866cdc1b60339054a",
+        "lastblockhash" : "0x05e4d7262eb86d79f63de2c2502c295aa21de3032c935cbb04615f6d82551614",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fae9d9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fba1627",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -334,36 +349,41 @@
         }
     },
     "delegatecodeDynamicCode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c32",
-                    "hash" : "37e105af04995babce01e4b1627375cbb152d05c406a8d838f76298e47fc52b2",
-                    "mixHash" : "e08fcc80d56f493c343a92091f100b1efae6a95aa4047851d3198cd8d7e61ae2",
-                    "nonce" : "803a30d126f026c3",
+                    "hash" : "0x185469c67559ebc77f653328b002ab8a7f07c8dda5a76c8387baff4ecbc9ac05",
+                    "mixHash" : "0x4a2efa6a439dd03eebbf9edbcbcc89476884e1d5fa6c44f5fd316d0f27e2eeb0",
+                    "nonce" : "0x765247740347a5e2",
                     "number" : "0x01",
-                    "parentHash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
-                    "stateRoot" : "2d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76",
+                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+                    "receiptTrie" : "0x0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
+                    "stateRoot" : "0x2d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a0e08fcc80d56f493c343a92091f100b1efae6a95aa4047851d3198cd8d7e61ae288803a30d126f026c3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a04a2efa6a439dd03eebbf9edbcbcc89476884e1d5fa6c44f5fd316d0f27e2eeb088765247740347a5e2f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
                         "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -373,37 +393,37 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "37e105af04995babce01e4b1627375cbb152d05c406a8d838f76298e47fc52b2",
+        "lastblockhash" : "0x185469c67559ebc77f653328b002ab8a7f07c8dda5a76c8387baff4ecbc9ac05",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "13136008b64ff592819b2fa6d43f2835c452020e" : {
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
@@ -412,21 +432,21 @@
                     "0x14" : "0x1000000000000000000000000000000000000000"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f68c32",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fbe73ce",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                 "balance" : "0x01",
                 "code" : "0x600160005533601455",
                 "nonce" : "0x00",
@@ -435,16 +455,144 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecodeDynamicCode_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01f27b",
+                    "hash" : "0x3ec1fb695fbc531ba4c50761b7353a7a0cade57704c083b0ee8223fcf96766c8",
+                    "mixHash" : "0xef0de38f12b9f9722f1e59d091cacad0a4e409a59517561fb8282e4dc01d585c",
+                    "nonce" : "0x4e35ff0381eeb004",
+                    "number" : "0x01",
+                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+                    "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
+                    "stateRoot" : "0x82d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0ef0de38f12b9f9722f1e59d091cacad0a4e409a59517561fb8282e4dc01d585c884e35ff0381eeb004f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3ec1fb695fbc531ba4c50761b7353a7a0cade57704c083b0ee8223fcf96766c8",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x270f",
+                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                    "0x0b" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f27b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf0d85",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x2710",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2386f26fc10000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }