replace SUICIDE with SELFDESTRUCT

30 files changed, 496 insertions, 496 deletions

diff --git a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
index fccf4ac4a..edce391e4 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Call1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x28d138",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
+                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
+                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
+                    "hash" : "0x95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
+                    "hash" : "0x95039d2266cf043d284b35099fd1eaeb9343465e37cf97db82b86af218a992dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "aaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
+                    "hash" : "0xaaead1065382a87e86f895d97eb30e29a9fbc52341b6991ee0a6892345a36e73",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,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" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "17592186099592"
+                "0x10000000d788"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
index 0248ca29d..cedca4087 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
@@ -1,17 +1,17 @@
 {
     "Call1024PreCalls" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
+                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
+                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
+                    "hash" : "0xf602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
+                    "hash" : "0xf602f8357f3f9231189f843971ff00681946cc6ce3415c9479a50589b9fbaffc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
+                    "hash" : "0x34c0da29bceb7ce1061ce30b71df471f7f667f87b3f013d6e838a5691ddc6255",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,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" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
index 8f76f1d4e..b88a12d3f 100644
--- a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
@@ -1,17 +1,17 @@
 {
     "Callcode1024BalanceTooLow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
+                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
+                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
+                    "hash" : "0x963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
+                    "hash" : "0x963d1b4a5f3d2ccf85ae1c43dc3c7540b60a540d09ef403d1b2a58db4c224401",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "cd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
+                    "hash" : "0xcd7b0f52aa9ac64427a044dc051e761cbd67e5abe9a79c15c63062ed6f5e45eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,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" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -92,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
index e48278d90..4b07e61ef 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "defca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
+                    "hash" : "0xdefca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "defca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
+                    "hash" : "0xdefca738f9a2ae3474a4035fadd06340c827fb753aa8285c2f39446b0210cdfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "180066"
+                "0x02bf62"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
index 86f273923..f597d83a2 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
+                    "hash" : "0x41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
+                    "hash" : "0x41fa034882c906ca932f8218b784af202dee537413a6f342d083257609f77efa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
+                    "hash" : "0x33bb0456eb22ddeb54adf46f74d79d465efa4a577efa67a29aab5c67640123cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150066"
+                "0x024a32"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
index f7a475e10..c49e47f02 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
@@ -1,17 +1,17 @@
 {
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
+                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
+                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
+                    "hash" : "0xd571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
+                    "hash" : "0xd571f2018d13b8898f61434841ec3bd1380bf3720cd9d916580cf0bf04aa793d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
+                    "hash" : "0xfbfab140075c759ed020052405b4a2369d5c42cc185569f9427b1744b353214e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,30 +61,30 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
index 5a79b5974..c374db29b 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcallcall_000_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
+                    "hash" : "0xa767a97d79ec39107df9149cc68b1199fcdc3fd89a41193dd5c280eeb56ddc42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "eaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
+                    "hash" : "0xeaa75d5c02ffb6835ea792d976c4944bc11f4e27a85227c8cf73ee14c451ff46",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
index 6aef226ca..b52865f9d 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
+                    "hash" : "0x59f3975264b93f4097b183f9ed5dfda26667e2feb0ef6c0938dd9f49e97fdbdc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
+                    "hash" : "0xef211f7b041d3ef77a8575136a6364fd7ec5975ec2fedac3668d61ed1d9ff93e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
+                    "hash" : "0xa17df9238a8f84b1d45abbf2608ef80e5dcd07de0c8dd2bbcf98ca21db99753c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
index 2a3444a28..36de7a9a0 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
+                    "hash" : "0x3d6bf725e57e6ea3481ed50a8f0338c92858bdf33c36fdb336b5d1b1d3fdb646",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59d69179aa4aaa0694c84e6c803e6d9fb3932568a197083bb0b7ac9ba1f01559",
+                    "hash" : "0x59d69179aa4aaa0694c84e6c803e6d9fb3932568a197083bb0b7ac9ba1f01559",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
+                    "hash" : "0xf8bdb1563d3bfa59ad72beb2da61a648e252f9a626690a34720b4a570c4c53a2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
index 34408d7b9..0c88bff92 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcallcallcode_001_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
+                    "hash" : "0xed050e8941d0530b3fab2fe1307f8b8ebed135ad216d2aa8f52c2d83f22399b0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
+                    "hash" : "0x85024ce7f661d120051f7221c36fa705e32eb6e5f0a1df3de2452b6dd3f0f488",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
index 3330dc31c..2811dcc93 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
+                    "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "de101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
+                    "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
index 5ab3eb341..f733c8c29 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
+                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
+                    "hash" : "0x60c4f8cfe444a136e9b4bd6dc4619484fbabe8dea905ee61b243f8e2568f9b42",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
+                    "hash" : "0x25eb00ab4fb36d94c41162afd9e87daf94cc10f2ccc7bd6c3b8199092996c0fa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
index 6dea03eaa..93427e897 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecall_010_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
+                    "hash" : "0xc41a25808023d223b1dc3f3914c233a901168605f5f02a9f15c5fadce6044462",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
+                    "hash" : "0x0e2b3eba8b61eda5f874976573a954510a2097f039564011eb11bb356a52eee2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
index 67dee9983..ff56a9d01 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
+                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
+                    "hash" : "0x953f39215417f53317d23e5a28ff959337d00e9f1507b5c1617499d6b518613f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
+                    "hash" : "0xdd118bf6242fb4b338d4e7296394fd9b163a073146a4dea27799249382b2ccb1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
index 4d7345ed1..96f1f834c 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcallcodecallcode_011_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
+                    "hash" : "0xcd6b0d134a9ebf655f0e1f76cb2d6c8c66a36c478867d3abbb00d7655dbf0911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
+                    "hash" : "0xb1ae24b7ad575830405dcb5f29c2aeaa71ad90828970a9a729542de6a3d35daa",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
index a2a8bd998..ec096e9eb 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
+                    "hash" : "0xb62569cbaffe068e783d4870d965fa783b0dd7d06bded6838715228457cb3262",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
+                    "hash" : "0xaae346ca92f96acc0d6b144e16bf1690ff1c32d06bf5e595f6f23f3366925abd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "af584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
+                    "hash" : "0xaf584519416197f347328bd8c334df83e892e6821fa77a6409e17acc7f07c875",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
index d964d0450..139d0bd6e 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
+                    "hash" : "0x46dd20e8074230b6e3dc9d29cea3d5b5aeabc6032c31d751130053cb15cb917f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
+                    "hash" : "0xd6eff2dc4e89f3ba043d1c75f6e19070f941a1c617f3d4a81c2d22faf2c8f395",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
+                    "hash" : "0xa50cb0d18f5a8f36f9db0aa1bdf1c77f149dd4e941b7d4cc5e5710a78f3f0b56",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
index 7a6db09c7..ed6eda97d 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcall_100_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
+                    "hash" : "0x278c6d69454c759028bab28462a540d7f0d8affdf3be9ab83ad873942f4d7169",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
+                    "hash" : "0x1ccdddfee7c5341f862e77e4b217b4ab98be631d8dd5c81a328b57efcb2f00ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
index a10b64c5f..8b9138b4e 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
+                    "hash" : "0x9dadc649bd108ae1326e1f7d8a113435e18e38fa2e345ebbe8e3b6c57d17c0b6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
+                    "hash" : "0x9cea071166a4152be65f70641dad45a5281bb3166af3b879a1f81c1f30cd03dd",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
index 2e030decf..27148623b 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
+                    "hash" : "0x6d479eeebd4394d608e4c0773568b4b397afc1528e762283fe0e412f9dd4cd61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
+                    "hash" : "0xe992a79fb556b4ffabc16a460d25f8201d477ff4bccf72b91d505b74e5084069",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
+                    "hash" : "0x72789093fd286d124a94068c11cb5189564e50490626464d2d3aab6ec7049aac",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
index d54797042..5e2872201 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcallcode_101_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
+                    "hash" : "0x32d1c8975997225104e8de7199b9e8ce62ba0565858d7061c949cb14f2acf6d2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
+                    "hash" : "0x84f98a6f88dfc72446020065f3e1b40263570f9ab2fa17d80a47a1c5594d9bfe",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
+                    "hash" : "0x58639a1a71f4da2f6795c2a3c4dbcac89c34e9b9aeebd669d1f5868615a93208",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
index 7f9fe2108..c8ebe8082 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
+                    "hash" : "0x7f80cbb5991fa0786b95a163abe66f6ed0b4e9a59ea334c8b9c849dfd8578cb4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
+                    "hash" : "0x9c301320a19121eac101086d4959324be54a0409be44ca96a9a6047bb76a74a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
+                    "hash" : "0x19981474be0091e4bcf8c3ced4c9a2b9264ab6f76ccb3708560a5fa014f74677",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
index 7ec71464f..f91707311 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
+                    "hash" : "0x138c60f195439626897fb8dadf9cfe47c646ad81c58e574189074f237c6ae056",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
+                    "hash" : "0xad940b40dea79c3e416dae92a5713a44612a519ad5dc4e9d71268c0155fc847c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
+                    "hash" : "0x62010bbb8d95a6c25afbaa0ede857cd283cac73a00a420261a3ec0169a5bd5b4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
index 29930e8c8..8f5553848 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecall_110_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
+                    "hash" : "0x961d5c285a8e9cfd352cd1a30ff61cc7afe45d8474265fc2b63c6c9c67296b90",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
+                    "hash" : "0x36fee991ca568d9360f7aea3e69b13c04ed83efa13dd71b91b7bb3b9d41e345b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
index 97ae3fbbc..9496e79bb 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
+                    "hash" : "0x6b91bfc795dca3991ec5721c8ea8a823e6dd446688e27285d8d0500bba8ab56c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
+                    "hash" : "0x2f6ccfc9fda43ebb03e01bc68951ec9bf51f62a9c5cf1ed708701f343df4eee4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
index 120bd8258..6f24804e8 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_1" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
+                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
+                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a4e4b368d67023020c45ebf2a58f6e357d6d2a9b74191722a0ef6ecea030a9ec",
+                    "hash" : "0xa4e4b368d67023020c45ebf2a58f6e357d6d2a9b74191722a0ef6ecea030a9ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb7d9040e9e5916420948b71d1a123ab257038690f6998aa29bcc2de613c26b8",
+                    "hash" : "0xfb7d9040e9e5916420948b71d1a123ab257038690f6998aa29bcc2de613c26b8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
+                    "hash" : "0x1b7fea7d4d78014c3e60b9a5f7c93a6588cfbf841bf82a6dae077a662a20e2df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
index 64c671c2d..158db6ccf 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
+                    "hash" : "0x2b024b21c2daf897cc6913b84049c8e13b8919bd596cb7041d771e8c44262849",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
+                    "hash" : "0xb53d71ec73b762655d97cbd7e1b208ae64409ae2cd3d38574dec49d07d20109f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
+                    "hash" : "0x711948edc65c8b7d199a7731e6054d7e07d06c083eb98c473d3cde0e85488e5a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
index e7ef04af3..e28433482 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
@@ -1,17 +1,17 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
+                    "hash" : "0x89be528276a8183204498a5272ed515fa790cee710ef54d679657bd45159b59b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
+                    "hash" : "0x0550d64d8201900071745405c166cde9253bbc201a9031b932c76f4d5f496ddc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
+                    "hash" : "0x011fa4e27c42d447b72696d3aa37e5c1594c5a0228c2703270fc76b48b2ee39b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,37 +61,37 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -102,14 +102,14 @@
                 ""
             ],
             "gasLimit" : [
-                "172000"
+                "0x029fe0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
index f52244e29..9114f0cec 100644
--- a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
@@ -1,17 +1,17 @@
 {
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "28986b1dd2a8b774b9c931b43a146f60686ed1fd6073f59f6ce678a27eb9ff7a",
+                    "hash" : "0x28986b1dd2a8b774b9c931b43a146f60686ed1fd6073f59f6ce678a27eb9ff7a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
+                    "hash" : "0x8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2960c7ae0990124a74d14254b302f847bdac3c0f0d6e438d93114ab442c54bf1",
+                    "hash" : "0x2960c7ae0990124a74d14254b302f847bdac3c0f0d6e438d93114ab442c54bf1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "af7b43e1b2c6afeca739391b312df5262af05dd64b6d0716d26d8d66816c8278",
+                    "hash" : "0xaf7b43e1b2c6afeca739391b312df5262af05dd64b6d0716d26d8d66816c8278",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
+                    "hash" : "0x8b1de25de155bec2239c83319199bd3b822b0bfbf7cbb6a23ac39ef11538f018",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 "0x6040600060406000600073100000000000000000000000000000000000000161c350f1"
             ],
             "gasLimit" : [
-                "96000"
+                "0x017700"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "",
             "value" : [
-                ""
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
index 891bd3faa..e842aeede 100644
--- a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
@@ -1,17 +1,17 @@
 {
     "createInitFail_OOGduringInit" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
+                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
+                    "hash" : "0x297303455494578a5176177ff1b9db0b0a516255a3d062fb960bbc99e60d8eb5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
+                    "hash" : "0x97f22c8456ec99501c3eb4f86927b26c6aa50f658a5939fdc20234f1d376a6e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "53021"
+                "0xcf1d"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100000"
+                "0x0186a0"
             ]
         }
     }