replace SUICIDE with SELFDESTRUCT

24 files changed, 372 insertions, 372 deletions

diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json
index ba2019c95..29c871282 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
+                    "hash" : "0x7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
+                    "hash" : "0x7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
+                    "hash" : "0x7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
+                    "hash" : "0x7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
+                    "hash" : "0x7c671ee761d8ff44053165bcd055417cde367f7776a09e89d8784733c2cc8455",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json
index b1c9c56ee..595519ddc 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_ToEmpty_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
+                    "hash" : "0x630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
+                    "hash" : "0x630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
+                    "hash" : "0x630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
+                    "hash" : "0x630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
+                    "hash" : "0x630c80a1c9136dc756e603afbed948f4e6dfb1a597251f0cf140db05b07d61f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json
index bd4928581..b5374a8a0 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
+                    "hash" : "0xc31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
+                    "hash" : "0xc31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "c31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
+                    "hash" : "0xc31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "c31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
+                    "hash" : "0xc31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "c31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
+                    "hash" : "0xc31305ac8b8b15aadad1f343c288bdd42726b6902055ec3c0a977ccc039a9c6f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json
index 55a421bc2..2a610c781 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
+                    "hash" : "0x95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
+                    "hash" : "0x95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
+                    "hash" : "0x95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
+                    "hash" : "0x95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
+                    "hash" : "0x95715d1fa0904eb8f52873eaf933dc12e00d41faea8b4ea8c66a8ccacb473658",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f2600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json
index 0eef3ee66..ff01c56e7 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "b622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
+                    "hash" : "0xb622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "b622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
+                    "hash" : "0xb622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
+                    "hash" : "0xb622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "b622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
+                    "hash" : "0xb622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "b622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
+                    "hash" : "0xb622f77cc366ee38e0e60445d264976e17e146db1b41d2587ab15155387a907d",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json
index 45ca83f21..42b3206c7 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_ToEmpty_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
+                    "hash" : "0x20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
+                    "hash" : "0x20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
+                    "hash" : "0x20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
+                    "hash" : "0x20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
+                    "hash" : "0x20834488e0d6128d6814ee000f67af658e4420093a5c2f19a57296f4ce292808",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json
index 3bb9aeb7a..1f8f809d6 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_ToNonZeroBalance_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
+                    "hash" : "0xa97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
+                    "hash" : "0xa97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "a97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
+                    "hash" : "0xa97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "a97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
+                    "hash" : "0xa97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "a97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
+                    "hash" : "0xa97a6631a53210bde93e99773769869061c90aa80ac6ea87af91bd09210a8f82",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json
index 9fb32a8b8..9ab1351e6 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_CALL_ToOneStorageKey_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
+                    "hash" : "0xfc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
+                    "hash" : "0xfc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
+                    "hash" : "0xfc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
+                    "hash" : "0xfc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
+                    "hash" : "0xfc6851b42397111254a685a51d674177f3ed4657d3390b60490eb367a32fda30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f1600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json
index ec9a32697..a5ad8520c 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
+                    "hash" : "0x7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
+                    "hash" : "0x7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
+                    "hash" : "0x7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
+                    "hash" : "0x7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
+                    "hash" : "0x7aeb2d877345123a802a775949e0e09fc84eb42f280a82f162f02d3581783a3a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json
index 71a8edf5e..dc3402b5c 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
+                    "hash" : "0x00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
+                    "hash" : "0x00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
+                    "hash" : "0x00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
+                    "hash" : "0x00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
+                    "hash" : "0x00743d3d0f3b1da4daab567b97c575568527aace98aad552a1bedd1e416629eb",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json
index 1dea324bc..0d073f64e 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "e33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
+                    "hash" : "0xe33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "e33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
+                    "hash" : "0xe33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "e33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
+                    "hash" : "0xe33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "e33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
+                    "hash" : "0xe33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "e33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
+                    "hash" : "0xe33cea28773e30d763ef33cc10b0b5a73c994857fda9b76404d77d2600d12ce2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json
index 47387907a..1ae841175 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
+                    "hash" : "0x58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
+                    "hash" : "0x58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
+                    "hash" : "0x58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
+                    "hash" : "0x58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
+                    "hash" : "0x58cbbcf521298087f5ad12f5b5c77963c083e1a9981460b60f722b384fa4cf75",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,23 +61,23 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x5a600055600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f4600155600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -89,14 +89,14 @@
                 ""
             ],
             "gasLimit" : [
-                "135000"
+                "0x020f58"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
index 321a32012..3f3bb8bdc 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
+                    "hash" : "0x9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
+                    "hash" : "0x9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
+                    "hash" : "0x9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
+                    "hash" : "0x9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
+                    "hash" : "0x9ac3a307c3b5591373262bbdc17452a09280a93ac00d9291e412dcde8be6bd6e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,21 +61,21 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b619c40f150600c600255600c600355600c6004555a606455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -88,14 +88,14 @@
                 ""
             ],
             "gasLimit" : [
-                "100000"
+                "0x0186a0"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
index 3850d0cc2..e580ec75c 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
+                    "hash" : "0x6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
+                    "hash" : "0x6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
+                    "hash" : "0x6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
+                    "hash" : "0x6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
+                    "hash" : "0x6576a4dd9ba26496b2487aad51843d033e6310d300efc8ac05ed12e8ac3bc1b7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "75000"
+                "0x0124f8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
index e32b481e9..fa88b1230 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "fea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
+                    "hash" : "0xfea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
+                    "hash" : "0xfea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "fea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
+                    "hash" : "0xfea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "fea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
+                    "hash" : "0xfea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "fea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
+                    "hash" : "0xfea0a0ec7aaebcf60ee31c12bab3a8d0c83528d6c2745d02640e8b697c529a98",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,28 +61,28 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -95,14 +95,14 @@
                 ""
             ],
             "gasLimit" : [
-                "75000"
+                "0x0124f8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
index fe31a02ad..c6bacb8ab 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
@@ -1,17 +1,17 @@
 {
-    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
+                    "hash" : "0x495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
+                    "hash" : "0x495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
+                    "hash" : "0x495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
+                    "hash" : "0x495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
+                    "hash" : "0x495b5fecb621447ae3999b739863351849b934844896fce657781b3b8888a4b3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,14 +61,14 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f150600c600255600c600355600c600455",
                 "nonce" : "0x00",
@@ -76,15 +76,15 @@
                     "0x00" : "0x01"
                 }
             },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
-            "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
                 "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
                 "nonce" : "0x00",
@@ -98,14 +98,14 @@
                 ""
             ],
             "gasLimit" : [
-                "75000"
+                "0x0124f8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json
index 860407900..72284b4b1 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 ""
             ],
             "gasLimit" : [
-                "20000"
+                "0x4e20"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json
index 3b223a409..057bdec52 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_ToEmpty_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "20000"
+                "0x4e20"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json
index 966ad8124..29798758b 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 ""
             ],
             "gasLimit" : [
-                "20000"
+                "0x4e20"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json
index c021b19c2..eacb612c1 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -82,14 +82,14 @@
                 ""
             ],
             "gasLimit" : [
-                "20000"
+                "0x4e20"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json
index 69396ac3c..38aa04a34 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+                    "hash" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,9 +61,9 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -74,14 +74,14 @@
                 "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json
index cb0e7b751..7f53c9c83 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
+                    "hash" : "0x137accfabce83c4f192c91b88d6e5e5e6e58afa387137b16170fafd5114d8d45",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json
index 0b955d2ea..8fc822ae1 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
+                    "hash" : "0x4575ff9537549d145650ffcb340dfba8c6fe2b4b0a45169a126195ba47f15e29",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x64",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -81,14 +81,14 @@
                 "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
             ],
             "gasLimit" : [
-                "60000"
+                "0xea60"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json
index aa94b6057..f8b100da5 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json
@@ -1,17 +1,17 @@
 {
     "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert" : {
         "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
             "currentNumber" : "0x01",
             "currentTimestamp" : "0x03e8",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -51,7 +51,7 @@
             ],
             "Metropolis" : [
                 {
-                    "hash" : "25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
+                    "hash" : "0x25a66260e106e4aabf890c1bc398ad84d91a5da434f7fe39c2664c2cb1b39e99",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -61,16 +61,16 @@
             ]
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xe8d4a51000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
@@ -82,14 +82,14 @@
                 "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d845a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
             ],
             "gasLimit" : [
-                "75000"
+                "0x0124f8"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
-            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
             "value" : [
-                "0"
+                "0x00"
             ]
         }
     }