replace SUICIDE with SELFDESTRUCT

16 files changed, 224 insertions, 224 deletions

diff --git a/GeneralStateTests/stSolidityTest/AmbiguousMethod.json b/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
index a2aae4ded..5306c75ae 100644
--- a/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
+++ b/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
@@ -1,17 +1,17 @@
 {
     "AmbiguousMethod" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
+                    "hash" : "0xc55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "d568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
+                    "hash" : "0xd568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
+                    "hash" : "0xc55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
+                    "hash" : "0xc55c94f5708aff56edbe823e1e448d4e7db3d9e4c693044f633c76395219a532",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "d568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
+                    "hash" : "0xd568910442624a2259901b496d69aeaa58375be8c9f8f18c5316251cf306f31e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json b/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
index 0f1cb0bb6..5b318d8bd 100644
--- a/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
+++ b/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
@@ -1,17 +1,17 @@
 {
     "CallInfiniteLoop" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
+                    "hash" : "0x94a768f71a8f2feee4dd28a9d71ac3c34b5324df442b634b47eb96139f2f9358",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x296df0df"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json b/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
index c038c9276..c2ff6ebdc 100644
--- a/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
+++ b/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
@@ -1,17 +1,17 @@
 {
     "CallLowLevelCreatesSolidity" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b228eae256f1654e21d832c5be223b05762abbe26f7a7aa46541e219fb40769b",
+                    "hash" : "0xb228eae256f1654e21d832c5be223b05762abbe26f7a7aa46541e219fb40769b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
+                    "hash" : "0x492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
+                    "hash" : "0x4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
+                    "hash" : "0x4b1504174022cbd59e4757634acd4fa9db18145fc5ea0a5893b7040a1e6879e6",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
+                    "hash" : "0x492942ca8f130e161aa13923a962a3133dd5a25f786eaa97985dc721dac212c9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json b/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
index 3085cb69a..a0dba551d 100644
--- a/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
+++ b/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
@@ -1,17 +1,17 @@
 {
     "CallRecursiveMethods" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
+                    "hash" : "0x28775a9bfb2082afcf55670f0cec3345867d51cf068580a38bb823d375e44f1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07a120",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x981a3165"
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/ContractInheritance.json b/GeneralStateTests/stSolidityTest/ContractInheritance.json
index 6ea718b2b..9fa7cfd7d 100644
--- a/GeneralStateTests/stSolidityTest/ContractInheritance.json
+++ b/GeneralStateTests/stSolidityTest/ContractInheritance.json
@@ -1,17 +1,17 @@
 {
     "ContractInheritance" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ef8d0a0e1452bcf2ec28e34e9945b26ae8cc833de5b2cec8b1306b70df6f2cbc",
+                    "hash" : "0xef8d0a0e1452bcf2ec28e34e9945b26ae8cc833de5b2cec8b1306b70df6f2cbc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
+                    "hash" : "0x296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
+                    "hash" : "0xe7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
+                    "hash" : "0xe7f84d674881d1cfd115be59e3e390271435c0b3474a482f7add54c3fe429d85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
+                    "hash" : "0x296b2fd1997a528da5f325628fbc77260461bca622bab66caf85fb4d1321a009",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
index b6019ac8b..2952372eb 100644
--- a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
+++ b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
@@ -1,17 +1,17 @@
 {
     "CreateContractFromMethod" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
+                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
+                    "hash" : "0xf188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
+                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
+                    "hash" : "0xb82770d51d1259de93c4e884e126cc1914564b6e87a6636f38f27c4d3b6bbf66",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
+                    "hash" : "0xf188cfbe040b966727dce0c929cc6711a42aa93d064515f751106ef1a9e7525d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
index 5ad905ee2..848ce6da7 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
@@ -1,17 +1,17 @@
 {
     "RecursiveCreateContracts" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "de2b270f7ca346807238c5d102d518d261a6abf4ff217a70ca1c7e7251bfb3ed",
+                    "hash" : "0xde2b270f7ca346807238c5d102d518d261a6abf4ff217a70ca1c7e7251bfb3ed",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
+                    "hash" : "0xbf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "f0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
+                    "hash" : "0xf0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "f0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
+                    "hash" : "0xf0259d59719b205707dabbde44be2a0e5ca1b74c3c132df147d992a0cc1b96e9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
+                    "hash" : "0xbf0e0fcf76fec2d3216a7830dbf3cb7f3bd715b6b3b245668d4e2946235c7bf4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4c4b40",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
index 12a585729..39a45431f 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
@@ -1,17 +1,17 @@
 {
     "RecursiveCreateContractsCreate4Contracts" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c9c2c49e4940b2ee507726474e8f5d31502ed5691e4edc27463058d676d69029",
+                    "hash" : "0xc9c2c49e4940b2ee507726474e8f5d31502ed5691e4edc27463058d676d69029",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
+                    "hash" : "0xf27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
+                    "hash" : "0xc2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
+                    "hash" : "0xc2fffb98fdd2871f70a001e775525039d94bb8ad0c3c783efa970af2e3ed54a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "f27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
+                    "hash" : "0xf27f3f2ecfc41e216642436c6c76ffdf50b68674dd698d6806cbaa295ad46260",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x4c4b40",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004"
             ],
             "gasLimit" : [
-                "300000"
+                "0x0493e0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json b/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
index 43f1b5f40..61c7e6835 100644
--- a/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
+++ b/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
@@ -1,17 +1,17 @@
 {
     "TestBlockAndTransactionProperties" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
+                    "hash" : "0x8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
+                    "hash" : "0x8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
+                    "hash" : "0x57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
+                    "hash" : "0x57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
+                    "hash" : "0x8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestContractInteraction.json b/GeneralStateTests/stSolidityTest/TestContractInteraction.json
index a28082472..b25aaa8b9 100644
--- a/GeneralStateTests/stSolidityTest/TestContractInteraction.json
+++ b/GeneralStateTests/stSolidityTest/TestContractInteraction.json
@@ -1,17 +1,17 @@
 {
     "TestContractInteraction" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "db558b22b3ae033794cf060d0800f57623b57015bbeaeef0ed64c97766768dca",
+                    "hash" : "0xdb558b22b3ae033794cf060d0800f57623b57015bbeaeef0ed64c97766768dca",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "bbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
+                    "hash" : "0xbbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
+                    "hash" : "0x8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
+                    "hash" : "0x8af7e668bc981aaa612683f34062e73fbcbb262d9394b199bdb08663d93c53c0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "bbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
+                    "hash" : "0xbbb317fbcb82c1477976d9720818306902a4da39aa3fbaa8b1d6e1c41199c8df",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestContractSuicide.json b/GeneralStateTests/stSolidityTest/TestContractSuicide.json
index 5667c0de4..649f10213 100644
--- a/GeneralStateTests/stSolidityTest/TestContractSuicide.json
+++ b/GeneralStateTests/stSolidityTest/TestContractSuicide.json
@@ -1,17 +1,17 @@
 {
     "TestContractSuicide" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fd54bdda8e31060ef262e7b63839f8d089db9f8997e1a675ad99fa592f314f00",
+                    "hash" : "0xfd54bdda8e31060ef262e7b63839f8d089db9f8997e1a675ad99fa592f314f00",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
+                    "hash" : "0xe75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
+                    "hash" : "0x367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
+                    "hash" : "0x367a4e05a146eef4824adcbb8c7e445dc01852707762a005b01b97ce1eb8622f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
+                    "hash" : "0xe75c86e24250e8c07574d7dbcf71440edabda1fc340eedcf88069de1e4419694",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json b/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
index fe931582d..2cdf16694 100644
--- a/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
+++ b/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
@@ -1,17 +1,17 @@
 {
     "TestCryptographicFunctions" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "0174852c4e603778f14fdc2c67ab61f72d13b9c5122e6050bf7c0560c83a02e3",
+                    "hash" : "0x0174852c4e603778f14fdc2c67ab61f72d13b9c5122e6050bf7c0560c83a02e3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
+                    "hash" : "0x88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
+                    "hash" : "0x3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
+                    "hash" : "0x3e2d93fa99efc8b83dfd38acc31be9d3f22d5336401f530127d8e976a111d756",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
+                    "hash" : "0x88b66fadcd2608906c1ceabb95144359b5d5c2f05a6c08ce5f9ced551bb49c96",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestKeywords.json b/GeneralStateTests/stSolidityTest/TestKeywords.json
index b4478b75e..eae86257e 100644
--- a/GeneralStateTests/stSolidityTest/TestKeywords.json
+++ b/GeneralStateTests/stSolidityTest/TestKeywords.json
@@ -1,17 +1,17 @@
 {
     "TestKeywords" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
+                    "hash" : "0x2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
+                    "hash" : "0x2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
+                    "hash" : "0x5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
+                    "hash" : "0x5d9414ffd30ec040a59e0a99b7a54097306ee5d426bd8adf8e5a99490ad083c5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
+                    "hash" : "0x2974402c2b5431807dc95248df9ca5e8869b4c77e23172d33bfa8bb77248a915",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "1"
+                "0x01"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestOverflow.json b/GeneralStateTests/stSolidityTest/TestOverflow.json
index 6d44f465f..d0b70eba2 100644
--- a/GeneralStateTests/stSolidityTest/TestOverflow.json
+++ b/GeneralStateTests/stSolidityTest/TestOverflow.json
@@ -1,17 +1,17 @@
 {
     "TestOverflow" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
+                    "hash" : "0x7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
+                    "hash" : "0x7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
+                    "hash" : "0x24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
+                    "hash" : "0x24c1690cfd30246726282bd723e2efc208a1bd3f734465a5c18b7fa81c4242c2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
+                    "hash" : "0x7c490eb6a0b4ac8bedc69db1542a68292124b7fb81f1d37c0fe1a538f7fcb96c",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
index 307f7bdd0..e559dd213 100644
--- a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
+++ b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
@@ -1,17 +1,17 @@
 {
     "TestStoreGasPrices" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
+                    "hash" : "0xe7b615fa0b33e1df7d7d59712c767013787a9f549cd65a4d22c8f143283ec4bb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x02faf080",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "35000000"
+                "0x02160ec0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json b/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
index 139dc67f1..603a54123 100644
--- a/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
+++ b/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
@@ -1,17 +1,17 @@
 {
     "TestStructuresAndVariabless" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
+                    "hash" : "0x3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
+                    "hash" : "0x3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
+                    "hash" : "0xfabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
+                    "hash" : "0xfabbcefefcd34f324da40464c4bd8df7a21d379e0a897796d290a2b49e974e88",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
+                    "hash" : "0x3c7eb90840853b3cea537fa2488045f4ec9be9ddb1469e0958e4dd90cf87cb49",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f4240",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0xc0406226"
             ],
             "gasLimit" : [
-                "350000"
+                "0x055730"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
             "value" : [
-                "100"
+                "0x64"
             ]
         }
     }