refill memory stress tests

44 files changed, 1052 insertions, 612 deletions

diff --git a/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json b/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
index d517992b6..d119b4837 100644
--- a/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
@@ -1,17 +1,17 @@
 {
     "BLOCKHASH_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x60004060005563ffffffff4060015567ffffffffffffffff406002556fffffffffffffffffffffffffffffffff406003557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json b/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
index 030a9b480..3cdcf6679 100644
--- a/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "BLOCKHASH_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xaa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x60004060005563ffffffff4060015567ffffffffffffffff406002556fffffffffffffffffffffffffffffffff406003557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
index 2ceb7b648..9be6aaab4 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
@@ -1,17 +1,17 @@
 {
     "CALLCODE_Bounds2OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
index 136cd182c..67024dd3a 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
@@ -1,17 +1,17 @@
 {
     "CALLCODE_Bounds3OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x118c30",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xa60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
index 60c9e375c..d1761b2de 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
@@ -1,17 +1,17 @@
 {
     "CALLCODE_Bounds4" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "hash" : "0xbb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "hash" : "0xbb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "hash" : "0xbb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "hash" : "0xbb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xbb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
index b4f7a04ac..306bc1bcb 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
@@ -1,17 +1,17 @@
 {
     "CALLCODE_Bounds4OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xd4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
index d6064ab43..99ee7198d 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "CALLCODE_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff250630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
index 1dc722c1c..1859d3d34 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
@@ -1,17 +1,17 @@
 {
     "CALL_Bounds2OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
index db743ed00..cbbfd077d 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
@@ -1,17 +1,17 @@
 {
     "CALL_Bounds2aOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds3.json b/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
index 39a9e229b..b20cce8c1 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
@@ -1,17 +1,17 @@
 {
     "CALL_Bounds3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "hash" : "0xffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "hash" : "0xffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "hash" : "0xffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "hash" : "0xffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
index 02150fa43..102c82331 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
@@ -1,17 +1,17 @@
 {
     "CALL_Bounds3OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
index 34db4bb9d..32bcadcba 100644
--- a/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "CALL_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff150630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
index 9c2d06363..aa472e5da 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
@@ -1,17 +1,17 @@
 {
     "CREATE_Bounds2OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x64",
                 "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215363ffffffff60006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
index 6645159d5..2c30f85af 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
@@ -1,17 +1,17 @@
 {
     "CREATE_Bounds3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "hash" : "0x164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "hash" : "0x164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "hash" : "0x164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "hash" : "0x164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x64",
                 "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215367ffffffffffffffff60006001f0506fffffffffffffffffffffffffffffffff60006001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60006001f0506000630fffffff6001f050600063ffffffff6001f050600067ffffffffffffffff6001f05060006fffffffffffffffffffffffffffffffff6001f05060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f050630fffffff630fffffff6001f05063ffffffff63ffffffff6001f05067ffffffffffffffff67ffffffffffffffff6001f0506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
index acb47aae7..c3e56eb7b 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
@@ -1,17 +1,17 @@
 {
     "CREATE_Bounds3OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x64",
                 "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215367ffffffffffffffff60006001f0506fffffffffffffffffffffffffffffffff60006001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60006001f0506000630fffffff6001f050600063ffffffff6001f050600067ffffffffffffffff6001f05060006fffffffffffffffffffffffffffffffff6001f05060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f050630fffffff630fffffff6001f05063ffffffff63ffffffff6001f05067ffffffffffffffff67ffffffffffffffff6001f0506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
index d9b99e92d..68b13b792 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "CREATE_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x64",
                 "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153600060006001f050630fffffff60006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
index 6f2241a34..aaf326ab7 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
@@ -1,17 +1,17 @@
 {
     "DELEGATECALL_Bounds2OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
index a14d28335..83d5215d9 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
@@ -1,17 +1,17 @@
 {
     "DELEGATECALL_Bounds3" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "hash" : "0x71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "hash" : "0x71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "hash" : "0x71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "hash" : "0x71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -82,10 +92,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
index dd8f0fea3..fd87c8be2 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
@@ -1,17 +1,17 @@
 {
     "DELEGATECALL_Bounds3OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
index da6adb841..ba52669a2 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "DELEGATECALL_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,23 +61,23 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x60006000600060007310000000000000000000000000000000000000016707fffffffffffffff450630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff45063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506000630fffffff6000630fffffff7310000000000000000000000000000000000000016707fffffffffffffff450600063ffffffff600063ffffffff7310000000000000000000000000000000000000016707fffffffffffffff450600067ffffffffffffffff600067ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff450630fffffff630fffffff630fffffff630fffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -78,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/DUP_Bounds.json b/GeneralStateTests/stBoundsTest/DUP_Bounds.json
index 66fa1a568..e3a3f1b2d 100644
--- a/GeneralStateTests/stBoundsTest/DUP_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/DUP_Bounds.json
@@ -1,17 +1,17 @@
 {
     "DUP_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x600080505063ffffffff80505067ffffffffffffffff8050506fffffffffffffffffffffffffffffffff8050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff805050600060008150505063ffffffff63ffffffff8150505067ffffffffffffffff67ffffffffffffffff815050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff815050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81505050600060006000825050505063ffffffff63ffffffff63ffffffff825050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff82505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff82505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8250505050600060006000600083505050505063ffffffff63ffffffff63ffffffff63ffffffff83505050505067ffffffffffffffff67ffffffffff",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff87",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
index 5b50ba328..35c783afe 100644
--- a/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "DUP_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xd77924065001f0e73dd647c655a5a4ba6437e7876eba3c1f22238172e73466a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x600080505063ffffffff80505067ffffffffffffffff8050506fffffffffffffffffffffffffffffffff8050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff805050600060008150505063ffffffff63ffffffff8150505067ffffffffffffffff67ffffffffffffffff815050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff815050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81505050600060006000825050505063ffffffff63ffffffff63ffffffff825050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff82505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff82505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8250505050600060006000600083505050505063ffffffff63ffffffff63ffffffff63ffffffff83505050505067ffffffffffffffff67ffffffffff",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff87",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json b/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
index 06c3238b1..59387f899 100644
--- a/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
@@ -1,17 +1,17 @@
 {
     "JUMPI_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "hash" : "0xb084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "hash" : "0xb084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "hash" : "0xb084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "hash" : "0xb084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xb084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json b/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
index 9d0576fe4..145d8ab9c 100644
--- a/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "JUMPI_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
index 52bd91959..2fca545f2 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
@@ -1,17 +1,17 @@
 {
     "JUMP_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "hash" : "0x2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "hash" : "0x2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "hash" : "0x2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "hash" : "0x2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
index c6b56ac9a..17b993985 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
@@ -1,17 +1,17 @@
 {
     "JUMP_Bounds2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "hash" : "0x75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "hash" : "0x75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "hash" : "0x75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "hash" : "0x75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
index 87695423b..4737f435c 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
@@ -1,17 +1,17 @@
 {
     "JUMP_Bounds2OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
index 3125538c4..1f109a1aa 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "JUMP_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x7fffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json
index 2fc8e354d..98adcb514 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json
@@ -1,17 +1,17 @@
 {
     "MLOAD_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7d9e23c09c86b067071c666cb03f16ad837fa9892937136a2fbb35a8aa240697",
+                    "hash" : "0x0221c038f88ffabc30ddd6c9203862a31c29158a22fa4f60950bea36d6e1927c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7d9e23c09c86b067071c666cb03f16ad837fa9892937136a2fbb35a8aa240697",
+                    "hash" : "0x0221c038f88ffabc30ddd6c9203862a31c29158a22fa4f60950bea36d6e1927c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7d9e23c09c86b067071c666cb03f16ad837fa9892937136a2fbb35a8aa240697",
+                    "hash" : "0x0221c038f88ffabc30ddd6c9203862a31c29158a22fa4f60950bea36d6e1927c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7d9e23c09c86b067071c666cb03f16ad837fa9892937136a2fbb35a8aa240697",
+                    "hash" : "0x0221c038f88ffabc30ddd6c9203862a31c29158a22fa4f60950bea36d6e1927c",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x0221c038f88ffabc30ddd6c9203862a31c29158a22fa4f60950bea36d6e1927c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x6000515063ffffffff51",
+                "code" : "0x63ffffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
index 64ff7a7e0..535ebb846 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
@@ -1,17 +1,17 @@
 {
     "MLOAD_Bounds2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "hash" : "0x09faccd72ea88a704d298e7e3618475783d6ac3a8b08e9e70cc9c28196a2d684",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "hash" : "0x09faccd72ea88a704d298e7e3618475783d6ac3a8b08e9e70cc9c28196a2d684",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "hash" : "0x09faccd72ea88a704d298e7e3618475783d6ac3a8b08e9e70cc9c28196a2d684",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "hash" : "0x09faccd72ea88a704d298e7e3618475783d6ac3a8b08e9e70cc9c28196a2d684",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x09faccd72ea88a704d298e7e3618475783d6ac3a8b08e9e70cc9c28196a2d684",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x67ffffffffffffffff51506fffffffffffffffffffffffffffffffff51507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
index 6878f2961..757a99da4 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
@@ -1,17 +1,17 @@
 {
     "MLOAD_Bounds2OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x80137ccc623c1ba0bf56943bb0e216b9fdcdd8c6dffbf9da71ceb10da611e713",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x67ffffffffffffffff51506fffffffffffffffffffffffffffffffff51507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
index dc7f02900..df526fa75 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
@@ -1,17 +1,17 @@
 {
     "MLOAD_Bounds3OOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "hash" : "0xc69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "hash" : "0xc69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "hash" : "0xc69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "hash" : "0xc69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xc69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x64ffffffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json b/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
index 5989f5536..b72181997 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "MLOAD_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x0bc954098c4d32194a9ddc0071d32cc469dc08c3d5544d7d3dc15bda8883c3e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x6000515063ffffffff51",
+                "code" : "0x63ffffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json b/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
index 1a18adefa..404880e87 100644
--- a/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
@@ -1,17 +1,17 @@
 {
     "MSTORE_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "hash" : "0xa5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "hash" : "0xa5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "hash" : "0xa5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "hash" : "0xa5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xa5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600167ffffffffffffffff52",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json b/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
index 6674ce620..6be30f180 100644
--- a/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
+++ b/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
@@ -1,17 +1,17 @@
 {
     "MSTORE_Bounds2" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600164ffffffffff52",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
index 9d025a01d..8b70da9fb 100644
--- a/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "MSTORE_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600167ffffffffffffffff52",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/POP_Bounds.json b/GeneralStateTests/stBoundsTest/POP_Bounds.json
index 3c8dab4d5..81d9b690a 100644
--- a/GeneralStateTests/stBoundsTest/POP_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/POP_Bounds.json
@@ -1,17 +1,17 @@
 {
     "POP_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x60005063ffffffff5067ffffffffffffffff506fffffffffffffffffffffffffffffffff507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff50",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
index eff247f57..001fead03 100644
--- a/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "POP_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x49d30e89222910cfe0cbe8911d755ffcbffbf5944a30887314d3eab43cbce7de",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x60005063ffffffff5067ffffffffffffffff506fffffffffffffffffffffffffffffffff507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff50",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/RETURN_Bounds.json b/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
index ab723a8a6..9fb3e13aa 100644
--- a/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
@@ -1,17 +1,17 @@
 {
     "RETURN_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+                    "hash" : "0x721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+                    "hash" : "0x721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5ba00bb0f767ef04e809f4e3268ae48dadc2b75c059af88059975f6d83e1e6bb",
+                    "hash" : "0x5ba00bb0f767ef04e809f4e3268ae48dadc2b75c059af88059975f6d83e1e6bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5ba00bb0f767ef04e809f4e3268ae48dadc2b75c059af88059975f6d83e1e6bb",
+                    "hash" : "0x5ba00bb0f767ef04e809f4e3268ae48dadc2b75c059af88059975f6d83e1e6bb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,128 +61,128 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff1600155600060006000600060007310000000000000000000000000000000000000026707fffffffffffffff1600255600060006000600060007310000000000000000000000000000000000000036707fffffffffffffff1600355600060006000600060007310000000000000000000000000000000000000046707fffffffffffffff1600455600060006000600060007310000000000000000000000000000000000000056707fffffffffffffff1600555600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600655600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600755600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600855600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600955600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600a55600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600b55600060006000600060007310000000000000000000000000000000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60006000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6000630ffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600063fffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000004" : {
+            "0x1000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "0x600067fffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000005" : {
+            "0x1000000000000000000000000000000000000005" : {
                 "balance" : "0x00",
                 "code" : "0x60006d0ffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000006" : {
+            "0x1000000000000000000000000000000000000006" : {
                 "balance" : "0x00",
                 "code" : "0x60007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000007" : {
+            "0x1000000000000000000000000000000000000007" : {
                 "balance" : "0x00",
                 "code" : "0x630fffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000008" : {
+            "0x1000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000009" : {
+            "0x1000000000000000000000000000000000000009" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000010" : {
+            "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x00",
                 "code" : "0x6d0fffffffffffffffffffffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000011" : {
+            "0x1000000000000000000000000000000000000011" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000012" : {
+            "0x1000000000000000000000000000000000000012" : {
                 "balance" : "0x00",
                 "code" : "0x630fffffff630ffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000013" : {
+            "0x1000000000000000000000000000000000000013" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff63fffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000014" : {
+            "0x1000000000000000000000000000000000000014" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff67fffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000015" : {
+            "0x1000000000000000000000000000000000000015" : {
                 "balance" : "0x00",
                 "code" : "0x6d0fffffffffffffffffffffffffff6d0ffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000016" : {
+            "0x1000000000000000000000000000000000000016" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -187,10 +197,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json b/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
index 0c6afc6de..f237c82a2 100644
--- a/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "RETURN_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,128 +61,128 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff1600155600060006000600060007310000000000000000000000000000000000000026707fffffffffffffff1600255600060006000600060007310000000000000000000000000000000000000036707fffffffffffffff1600355600060006000600060007310000000000000000000000000000000000000046707fffffffffffffff1600455600060006000600060007310000000000000000000000000000000000000056707fffffffffffffff1600555600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600655600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600755600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600855600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600955600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600a55600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600b55600060006000600060007310000000000000000000000000000000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60006000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6000630ffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x600063fffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000004" : {
+            "0x1000000000000000000000000000000000000004" : {
                 "balance" : "0x00",
                 "code" : "0x600067fffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000005" : {
+            "0x1000000000000000000000000000000000000005" : {
                 "balance" : "0x00",
                 "code" : "0x60006d0ffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000006" : {
+            "0x1000000000000000000000000000000000000006" : {
                 "balance" : "0x00",
                 "code" : "0x60007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000007" : {
+            "0x1000000000000000000000000000000000000007" : {
                 "balance" : "0x00",
                 "code" : "0x630fffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000008" : {
+            "0x1000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000009" : {
+            "0x1000000000000000000000000000000000000009" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000010" : {
+            "0x1000000000000000000000000000000000000010" : {
                 "balance" : "0x00",
                 "code" : "0x6d0fffffffffffffffffffffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000011" : {
+            "0x1000000000000000000000000000000000000011" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000012" : {
+            "0x1000000000000000000000000000000000000012" : {
                 "balance" : "0x00",
                 "code" : "0x630fffffff630ffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000013" : {
+            "0x1000000000000000000000000000000000000013" : {
                 "balance" : "0x00",
                 "code" : "0x63ffffffff63fffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000014" : {
+            "0x1000000000000000000000000000000000000014" : {
                 "balance" : "0x00",
                 "code" : "0x67ffffffffffffffff67fffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000015" : {
+            "0x1000000000000000000000000000000000000015" : {
                 "balance" : "0x00",
                 "code" : "0x6d0fffffffffffffffffffffffffff6d0ffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000016" : {
+            "0x1000000000000000000000000000000000000016" : {
                 "balance" : "0x00",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -183,14 +193,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json b/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
index 63179b366..c4af6f1f1 100644
--- a/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
@@ -1,17 +1,17 @@
 {
     "SLOAD_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x6000545063ffffffff545067ffffffffffffffff54506fffffffffffffffffffffffffffffffff54507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json b/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
index a0ce4f016..07256c0e2 100644
--- a/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "SLOAD_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "hash" : "0xe92c368377f8bae66097342b63f421dcd1d8e679aef42fd133b4dc8574717cf3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x03c73bdee9d82b284d98c672b59bcaff59daef066ddab684290a8c2e47e6c579",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
-                "code" : "0x6000545063ffffffff545067ffffffffffffffff54506fffffffffffffffffffffffffffffffff54507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json b/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
index 2b5eff350..0a7619120 100644
--- a/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
@@ -1,17 +1,17 @@
 {
     "SSTORE_Bounds" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0x2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600163ffffffff55600167ffffffffffffffff5560016fffffffffffffffffffffffffffffffff5560017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5563ffffffff60205567ffffffffffffffff6040556fffffffffffffffffffffffffffffffff6080557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61010055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -75,10 +85,10 @@
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
index a3e95e781..ae4dc5e91 100644
--- a/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
@@ -1,17 +1,17 @@
 {
     "SSTORE_BoundsOOG" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,17 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Metropolis" : [
+                {
+                    "hash" : "0xa490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,16 +61,16 @@
             ]
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x600163ffffffff55600167ffffffffffffffff5560016fffffffffffffffffffffffffffffffff5560017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5563ffffffff60205567ffffffffffffffff6040556fffffffffffffffffffffffffffffffff6080557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61010055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07ffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -71,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "150000"
+                "0x0249f0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x1000000000000000000000000000000000000000",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }