replace SUICIDE with SELFDESTRUCT

65 files changed, 910 insertions, 910 deletions

diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
index 3cbd64642..2ba1d3326 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
@@ -1,17 +1,17 @@
 {
     "calldatacopy_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
+                    "hash" : "0xfb0eef5366c4b1d9bd479557e0cbf35f0b1512f3f6cfea8fd2853933ec3c3d23",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff37",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
index 0a7e0f579..669b3d4ee 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
@@ -1,17 +1,17 @@
 {
     "calldatacopy_dejavu2 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
+                    "hash" : "0x74ee79796297a4556e905da5bc59648da679f19b3884a1a383e5b0c7a91c9e05",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
index 44fb1ee72..f3918bd85 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
@@ -1,17 +1,17 @@
 {
     "codecopy_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
+                    "hash" : "0x5e3bd4dc78514c1999c1d83a89bad70d4596bf2f1a8a53c406078f208257c174",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff39",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
index a3f50cd0d..13eb724e2 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
@@ -1,17 +1,17 @@
 {
     "codecopy_dejavu2 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
+                    "hash" : "0x368b88a2614b03725ac64cec0ef73009aaa11390385f0273541932e152f03900",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6005565b005b600a68010000000000000001601f3960005180600014600357640badc0ffee60",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
index 0da123061..63ec58284 100644
--- a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
@@ -1,17 +1,17 @@
 {
     "extcodecopy_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
+                    "hash" : "0x7db301c0754d4f94248fcc32e831c45b1a730331848fe6b51d1381b3b08ba403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffff630fffffff3c",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log1_dejavu.json b/GeneralStateTests/stMemoryTest/log1_dejavu.json
index 45503d85f..18ff5667b 100644
--- a/GeneralStateTests/stMemoryTest/log1_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log1_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log1_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
+                    "hash" : "0x236e71ab7e9bce4137b479cabfe2691738eb87b7e9221f69feab810e8d2d5def",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa1",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log2_dejavu.json b/GeneralStateTests/stMemoryTest/log2_dejavu.json
index 30e665102..d2f7757c7 100644
--- a/GeneralStateTests/stMemoryTest/log2_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log2_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log2_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
+                    "hash" : "0x4f5d3d8ba03ebe57a1ae72c00c7604c85a67edd03cc3b86ecbf3dbc760c17383",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff630fffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log3_dejavu.json b/GeneralStateTests/stMemoryTest/log3_dejavu.json
index 4787c8c11..b42817fa9 100644
--- a/GeneralStateTests/stMemoryTest/log3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log3_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log3_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/log4_dejavu.json b/GeneralStateTests/stMemoryTest/log4_dejavu.json
index 6f9070d1f..6b40fbd29 100644
--- a/GeneralStateTests/stMemoryTest/log4_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log4_dejavu.json
@@ -1,17 +1,17 @@
 {
     "log4_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
+                    "hash" : "0x9fc7f149800e24882ebf620c5be1aa59d621b38accc418df88bba08aec37e6a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60ff60ff630fffffffa2",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
index 5c41eea53..dc3f0c32d 100644
--- a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem0b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
+                    "hash" : "0xe0efa836f999455740148dc120dc5f2344ad3b3c1323dca3852268d7b243d0ec",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a60005359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
index fa7015799..23ad4f3ad 100644
--- a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem31b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
+                    "hash" : "0x604b731508388ec89df1d255944de348916844d5bd6c301ddc9cda6b78587154",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a601e5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
index e55b20315..17a10d5a5 100644
--- a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem32b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
+                    "hash" : "0x37091fe21c4e51aec98d8c91dd43221caa0299562e7e6408f30a26c7d3f42b3e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a601f5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+1.json b/GeneralStateTests/stMemoryTest/mem32kb+1.json
index a8858d242..b36685c4b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
+                    "hash" : "0x171d90f0d7d4dc497acbb9ae9293ab906ace85e65f13fb3088bdbd021e46097e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617ce152617ce15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+31.json b/GeneralStateTests/stMemoryTest/mem32kb+31.json
index 3776277ed..6ecd66490 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
+                    "hash" : "0x431025fb6f5dfd2375add19f1c807edbde060fc825224234b00c1e6bed33693b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cff52617cff5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+32.json b/GeneralStateTests/stMemoryTest/mem32kb+32.json
index 1c9ed4e46..218397cfa 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
+                    "hash" : "0x8300e03f4530881e7bf38b31e76bf0ea8b0661b8999bb5c6ed79d548a250fd3f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d0052617d005160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+33.json b/GeneralStateTests/stMemoryTest/mem32kb+33.json
index 0546c1cb9..a3198d753 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
+                    "hash" : "0x5aeebda7bc76659e25766c04d5e1d33ca3330a057e443093c675cba86c8eba22",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d0152617d015160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-1.json b/GeneralStateTests/stMemoryTest/mem32kb-1.json
index 34781fbde..327c40bda 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
+                    "hash" : "0x74214f4526e90cf38bfaf0df1b0dde9bdde8f28ff7018eb82efba1a27d46df37",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cdf52617cdf5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-31.json b/GeneralStateTests/stMemoryTest/mem32kb-31.json
index 32dbfed25..93e1e87b0 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
+                    "hash" : "0xf8d026ebbc585731386c6ea601053567cc8a61cb5d6f914b2ca998434fcaf08d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cc152617cc15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json
index e287cb286..f7c8ba5e4 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
+                    "hash" : "0xf2ccd3bdd3afd712768712179ccd506a4711ceee3a6903be053399a74077ac61",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cc052617cc05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-33.json b/GeneralStateTests/stMemoryTest/mem32kb-33.json
index 9c10fc8f7..89d2f0080 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
+                    "hash" : "0x55bd72cef2f9d05ec55e05fd8117ddab58ef72135d61be72e3a346d262c9f078",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cbf52617cbf5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb.json b/GeneralStateTests/stMemoryTest/mem32kb.json
index 245c58c6e..6e5ab827b 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb.json
@@ -1,17 +1,17 @@
 {
     "mem32kb " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
+                    "hash" : "0x89e9ff8359f5e43c9c09a84961d7ab11f4d939c1aa4698f86324e13a3b2cb60f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617ce052617ce05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
index ab9687af0..ce3c2e92f 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
+                    "hash" : "0xbce6091d727ff3b6b29ce187a343cf270ecb87fde937d65d32d41d5c4a7d7119",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d005359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
index 952f02bde..300517af9 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
+                    "hash" : "0x1cab92d6e5feda6736ef0b0714a018652323598895059e9e36da278c45c871a8",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d1e5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
index c6e0c3e3d..430043534 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
+                    "hash" : "0x75efddbdc85b42ff3c7550bf024c89151a8ea87d117ecadedfd6e7581e5f358d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d1f5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
index 03aa6b5d0..04b5ccadb 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
+                    "hash" : "0x07b152dfa501fa5581f636f29e759de90c51922b9d2b7cc92ddb8d284049a911",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617d205359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
index b5da53e09..90e06527e 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
+                    "hash" : "0xdfaacf050276c37e00aa5cbbcdc87a77cedf780556330796cb6dd775498c7585",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cfe5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
index 1922693a1..3a77bd255 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
+                    "hash" : "0x91e686a5caf72969cc88c885746cefa69b3089a80543eb9c75f2f2ce822b1e08",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617ce05359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
index b430b2360..cd6d3b1d6 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
+                    "hash" : "0x656252dfd066c252bc1a9c8b26fd3872596a192ce72b2fa09eb7148deef623a1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cdf5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
index 6919485bf..31c07b5b2 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
+                    "hash" : "0x176a30044205d80912efbb8c7ce308991823647e10a9bc68059ec54f086472f5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cde5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
index 321b4b06c..275d47391 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem32kb_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
+                    "hash" : "0x40285d734359495522cfab98a87348a90ecc13735492c974c58ffa9965e39b21",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a617cff5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
index 3abac6366..18cf6e2e2 100644
--- a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem33b_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
+                    "hash" : "0x8c85aa000727196f46d60276a9d5f7e5f1fa3c227564037d4e67f485acc28143",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a60205359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+1.json b/GeneralStateTests/stMemoryTest/mem64kb+1.json
index 63426d14f..2c05fd1f5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
+                    "hash" : "0x3fd0c39dc30723b802d138155edd2d9799d1a5a9f099188e93a177fdaf230b9a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9e15261f9e15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+31.json b/GeneralStateTests/stMemoryTest/mem64kb+31.json
index 819042436..cdfdef202 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
+                    "hash" : "0x4672c61dc31cdc14f6549392777b8e6be4290c41b4d49d76f9928843d8d6020b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9ff5261f9ff5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+32.json b/GeneralStateTests/stMemoryTest/mem64kb+32.json
index 6df5f38b6..ad871eba0 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
+                    "hash" : "0x749757456f4bf99685777d121180aa1b8824cfe2096fed7fa98220e5f3043fda",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa005261fa005160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+33.json b/GeneralStateTests/stMemoryTest/mem64kb+33.json
index c825cbed7..f27e5b451 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
+                    "hash" : "0x2b3c2cfc0fe0a279d8198025a6b6e4d840a4e93308276e89a52ab4d047bbfd24",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa015261fa015160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-1.json b/GeneralStateTests/stMemoryTest/mem64kb-1.json
index 3f54a319e..989dd37b5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
+                    "hash" : "0x9865c60dd34920cc8b049c244fbfbe6a5525290ba78b323680ee9e6ee44d302a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9df5261f9df5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-31.json b/GeneralStateTests/stMemoryTest/mem64kb-31.json
index ee171d486..6cfd20981 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
+                    "hash" : "0xfd3557635cb0b3fc93f76329006b2358ed056c1d8e63ae95fd218e5d77a34c97",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9c15261f9c15160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-32.json b/GeneralStateTests/stMemoryTest/mem64kb-32.json
index 474111524..da74cdb16 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
+                    "hash" : "0xbb8997f7b498ae27647ba01f44e89446b901ccb9cc31167c2c980a420aaa7ff1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9c05261f9c05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-33.json b/GeneralStateTests/stMemoryTest/mem64kb-33.json
index 58c156040..a2362e1c9 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
+                    "hash" : "0xa631dedf42e2d3c1716243107eb5e916b9a24c36dae8943bf785bda6b9f07607",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9bf5261f9bf5160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb.json b/GeneralStateTests/stMemoryTest/mem64kb.json
index 1adbb39e4..39342d69d 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb.json
@@ -1,17 +1,17 @@
 {
     "mem64kb " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
+                    "hash" : "0xbae3c3d010418555a351cd124aa6260c2b97744a53c3f69239099e890e03183c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9e05261f9e05160015559600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183640"
+                "0x500018d8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
index 3d49ca0b7..dc43607ff 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
+                    "hash" : "0xfc23dd420b833dbfcf772497eff7a70a6bc226629092097461cac9ce73cdc67a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa005359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
index f82e400ce..5b2cea0e4 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
+                    "hash" : "0x3c64f6daf9a82afa20b701121f233c206266672f7c31483c2d1c6b672dcce3a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa1e5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
index 79ff63f8d..80a54f704 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "df6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
+                    "hash" : "0xdf6fea74bff863af3b7cad335c92752c62a8f98ca94608d9976d841fc4125978",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa1f5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
index 927c5e706..63631d044 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte+33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "dc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
+                    "hash" : "0xdc9d2ddccb9a13e924b6792d42425ac4315003cc25d99ca08babfd650bb011c7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61fa205359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
index 9e87dede6..fe4ea1ff1 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-1 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
+                    "hash" : "0x3134bbc4d51a887ad390a20299609bc4ce33dce55ae5a93cb2f438c9574ee6ba",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9fe5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
index 02e9c4691..72a70a351 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-31 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
+                    "hash" : "0x18f01239fc57124bb4ea01c93cc534a790b83e7a15dbb4a7e6b0e078e6c2e389",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9e05359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
index d964d9d6d..b4fb0a4b5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-32 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
+                    "hash" : "0x1642f55308622bc1a705dc5c3cc62816d433ad263ec5847b62dd51af677930a7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9df5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
index 1dc9eb1f2..8893f67e5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte-33 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
+                    "hash" : "0x01c97ed590df6f0773df08a1fd59b4bfd7771a755443d1c01f17d563b9999bdf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9de5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
index 1cb4e78e0..d8465595e 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
@@ -1,17 +1,17 @@
 {
     "mem64kb_singleByte " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
+                    "hash" : "0x59bf1a3821d2430a3d3104bc474eb8937c974be0f1d730dd31afcb6993572d50",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x602a61f9ff5359600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/memReturn.json b/GeneralStateTests/stMemoryTest/memReturn.json
index 35074923c..dd364cfc1 100644
--- a/GeneralStateTests/stMemoryTest/memReturn.json
+++ b/GeneralStateTests/stMemoryTest/memReturn.json
@@ -1,17 +1,17 @@
 {
     "memReturn " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
+                    "hash" : "0x4ac120a0f842cd106b0b5affaec87476b7e0f14376ecb87bbefc001a695f3582",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x366000600037596000f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xff55883355001144bbccddffeeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
             ],
             "gasLimit" : [
-                "1342183320"
+                "0x50001798"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mload16bitBound.json b/GeneralStateTests/stMemoryTest/mload16bitBound.json
index b2a89d2dc..c42b8fda2 100644
--- a/GeneralStateTests/stMemoryTest/mload16bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload16bitBound.json
@@ -1,17 +1,17 @@
 {
     "mload16bitBound " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x10000804025c",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
+                    "hash" : "0x753bf8da2d26f11acfc8e3865eb40093071187f028ca996632d60b0af47a27a9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6201000051600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xa00050281798",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "17592320524892"
+                "0x10000804025c"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mload8bitBound.json b/GeneralStateTests/stMemoryTest/mload8bitBound.json
index c4a3255db..76941167c 100644
--- a/GeneralStateTests/stMemoryTest/mload8bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload8bitBound.json
@@ -1,17 +1,17 @@
 {
     "mload8bitBound " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
+                    "hash" : "0x68d0d02b58a7f988070b0e7f1a256be642aaccfd8bd91e18996c35611cfa054d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x61010051600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "220000"
+                "0x035b60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mload_dejavu.json b/GeneralStateTests/stMemoryTest/mload_dejavu.json
index c21de0538..3ec6fa1fe 100644
--- a/GeneralStateTests/stMemoryTest/mload_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mload_dejavu.json
@@ -1,17 +1,17 @@
 {
     "mload_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
+                    "hash" : "0xf1d720915cb0fba8d8688069483837e45cb53d4cfb2f0496db2ce3bde64bf12f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x630fffffff51",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mstore_dejavu.json b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
index f7986a4af..0c1092a83 100644
--- a/GeneralStateTests/stMemoryTest/mstore_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
@@ -1,17 +1,17 @@
 {
     "mstore_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
+                    "hash" : "0xe2c1656a205e46816a957285a55655a1a039d5d65d3e02b6252f6e934573dae4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff52",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
index 19d470730..82f616cb2 100644
--- a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
@@ -1,17 +1,17 @@
 {
     "mstroe8_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
+                    "hash" : "0x1dec281f3d5384490d22a942941948d3d5453bf19a0855c81e60a722803f0043",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60f1630fffffff53",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/sha3_dejavu.json b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
index b0b516ea1..6a757e7fc 100644
--- a/GeneralStateTests/stMemoryTest/sha3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
@@ -1,17 +1,17 @@
 {
     "sha3_dejavu " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
+                    "hash" : "0x37302f4388dcbe3d2a8c109b8670bd595291270a170d76dea20460515d95909e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff630fffffff20",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "42949672960"
+                "0x0a00000000"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
index 5df7d3a4b..9de347e91 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
@@ -1,17 +1,17 @@
 {
     "stackLimitGas_1023 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
+                    "hash" : "0x2e0e076db6976344c9662b3f3226fda27aff53e348bd5609e4a7154a2b20fd01",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fd6000525b5a60016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
index 0b5ba361b..949455a5a 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
@@ -1,17 +1,17 @@
 {
     "stackLimitGas_1024 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
+                    "hash" : "0xa7c41770a298ad62de3c3216658fecaa16550b911fe62265c9cce6e3a55adad6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fe6000525b5a60016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
index dca5fd515..29647efcc 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
@@ -1,17 +1,17 @@
 {
     "stackLimitGas_1025 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
+                    "hash" : "0x0bf698140781a243586d4b8a3b5af5e3d9196a961215295e15d4a21fb9405983",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b5a60016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
index 744c638da..b89e4f826 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush31_1023 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
+                    "hash" : "0x012034963f12ba01a075eaf2399fe9903fce7de6875eb5b4060e722850743041",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fd6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
index c476dc597..bf4aff189 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush31_1024 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
+                    "hash" : "0x9c9fd8f67a6af918d96deccd3a0e96fc0a4496af936ec9f542be019f985ea528",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fe6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
index 78778eb60..b7619d076 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush31_1025 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
+                    "hash" : "0x4aac593c435cf2fa2b0ff6596215af980e85c185a6d115884cf7e4d7d9d36321",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7e0102030405060708090a0102030405060708090a0102030405060708090a0160016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
index 7a9013fe4..528552d06 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush32_1023 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
+                    "hash" : "0x0538c5873643505fc0ceb8f55945729bfadd0dde4bcc0a30a544162236b1a90b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fd6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
index ab5fbd338..a4ac4f24c 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush32_1024 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
+                    "hash" : "0x8c09fdc294863a6a0d8c06bf3346ed48f1794a4513c74d79d6010eedfca91c5f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103fe6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
index a8f07a6b0..bf741275e 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
@@ -1,17 +1,17 @@
 {
     "stackLimitPush32_1025 " : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
+                    "hash" : "0x2b2c33348aabc10de2654557fe330f3d0d20ecf113613e7e016c3fdefcc610ef",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6103ff6000525b7f0102030405060708090a0102030405060708090a0102030405060708090a010260016000510360005260005160065700",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x6400000000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : [
-                "10"
+                "0x0a"
             ]
         }
     }